Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Author: pboy Date: 2012-12-22 14:03:34 +0000 (Sat, 22 Dec 2012) New Revision: 2440 Added: contrib/camden/ccm-lbc-decisiontree/sql/ccm-lbc-decisiontree/ contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.config contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.load contrib/camden/ccm-lbc-decisiontree/web/themes/ contrib/camden/ccm-lbc-decisiontree/web/themes/heirloom/ contrib/camden/ccm-lbc-decisiontree/web/themes/heirloom/contenttypes/ contrib/camden/ccm-lbc-decisiontree/web/themes/heirloom/contenttypes/DecisionTree.xsl Removed: contrib/camden/ccm-lbc-decisiontree/etc/ contrib/camden/ccm-lbc-decisiontree/sql/ccm-ldn-camden-decisiontree/ contrib/camden/ccm-lbc-decisiontree/sql/oracle-se/ contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.config contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.load contrib/camden/ccm-lbc-decisiontree/trunk/ contrib/camden/ccm-lbc-decisiontree/web/static/ Modified: contrib/camden/ccm-lbc-decisiontree/application.xml contrib/camden/ccm-lbc-decisiontree/src/com/arsdigita/camden/cms/contenttypes/DecisionTreeInitializer.java Log: Next part of adaptation to version 2. NOT TESTED yet. Modified: contrib/camden/ccm-lbc-decisiontree/application.xml =================================================================== --- contrib/camden/ccm-lbc-decisiontree/application.xml 2012-12-22 11:10:05 UTC (rev 2439) +++ contrib/camden/ccm-lbc-decisiontree/application.xml 2012-12-22 14:03:34 UTC (rev 2440) @@ -1,9 +1,9 @@ <?xml version="1.0"?> <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" - name="ccm-ldn-camden-decisiontree" + name="ccm-lbc-decisiontree" prettyName="Red Hat CCM Content Types" - version="1.0.3" - release="3" + version="6.6.0" + release="1" webapp="ROOT"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/> Copied: contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.config (from rev 2439, contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.config) =================================================================== --- contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.config (rev 0) +++ contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.config 2012-12-22 14:03:34 UTC (rev 2440) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<registry> + <!-- nothing yet --> +</registry> + \ No newline at end of file Copied: contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.load (from rev 2439, contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.load) =================================================================== --- contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.load (rev 0) +++ contrib/camden/ccm-lbc-decisiontree/src/ccm-lbc-decisiontree.load 2012-12-22 14:03:34 UTC (rev 2440) @@ -0,0 +1,16 @@ +<load> + <requires> + <table name="inits"/> + <table name="acs_objects"/> + <table name="cms_items"/> + <initializer class="com.arsdigita.cms.Initializer"/> + </requires> + <provides> + <table name="cam_decision_trees"/> + <initializer class="com.arsdigita.camden.cms.contenttypes.DecisionTreeInitializer"/> + </provides> + <scripts> + <schema directory="ccm-lbs-decisiontree"/> + <data class="com.arsdigita.camden.cms.contenttypes.DecisionTreeLoader"/> + </scripts> +</load> Deleted: contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.config =================================================================== --- contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.config 2012-12-22 11:10:05 UTC (rev 2439) +++ contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.config 2012-12-22 14:03:34 UTC (rev 2440) @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<registry> - <!-- nothing yet --> -</registry> - \ No newline at end of file Deleted: contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.load =================================================================== --- contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.load 2012-12-22 11:10:05 UTC (rev 2439) +++ contrib/camden/ccm-lbc-decisiontree/src/ccm-ldn-camden-decisiontree.load 2012-12-22 14:03:34 UTC (rev 2440) @@ -1,16 +0,0 @@ -<load> - <requires> - <table name="inits"/> - <table name="acs_objects"/> - <table name="cms_items"/> - <initializer class="com.arsdigita.cms.Initializer"/> - </requires> - <provides> - <table name="cam_decision_trees"/> - <initializer class="com.arsdigita.camden.cms.contenttypes.DecisionTreeInitializer"/> - </provides> - <scripts> - <schema directory="ccm-ldn-camden-decisiontree"/> - <data class="com.arsdigita.camden.cms.contenttypes.DecisionTreeLoader"/> - </scripts> -</load> Modified: contrib/camden/ccm-lbc-decisiontree/src/com/arsdigita/camden/cms/contenttypes/DecisionTreeInitializer.java =================================================================== --- contrib/camden/ccm-lbc-decisiontree/src/com/arsdigita/camden/cms/contenttypes/DecisionTreeInitializer.java 2012-12-22 11:10:05 UTC (rev 2439) +++ contrib/camden/ccm-lbc-decisiontree/src/com/arsdigita/camden/cms/contenttypes/DecisionTreeInitializer.java 2012-12-22 14:03:34 UTC (rev 2440) @@ -24,55 +24,86 @@ import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; import com.arsdigita.persistence.DataObject; +import com.arsdigita.runtime.ContextInitEvent; import com.arsdigita.runtime.DomainInitEvent; -import com.arsdigita.runtime.LegacyInitEvent; import com.arsdigita.search.MetadataProviderRegistry; /** - * Runtime initialization for the Decision Tree content type. + * Executes at each system startup and initializes the Decision Tree + * content type. + * + * Defines the content type specific properties and just uses the super class + * methods to register the content type with the (transient) content type store + * (map). This is done by runtimeRuntime startup method which runs the init() + * methods of all initializers (this one just using the parent implementation). * * @author Carsten Clasohm * @version $Id$ */ public class DecisionTreeInitializer extends ContentTypeInitializer { - - public final static String versionId = "$Id$"; - - public void init(LegacyInitEvent evt) { - super.init(evt); - - MetadataProviderRegistry.registerAdapter( - DecisionTree.BASE_DATA_OBJECT_TYPE, - new ContentPageMetadataProvider()); + + /** + * Constructor, sets the PDL manifest file and object type string. + */ + public DecisionTreeInitializer() { + super("ccm-lbc-decisiontree.pdl.mf", DecisionTree.BASE_DATA_OBJECT_TYPE); } + @Override public void init(DomainInitEvent evt) { super.init(evt); DomainObjectFactory f = evt.getFactory(); - f.registerInstantiator(SectionOption.BASE_DATA_OBJECT_TYPE, new DomainObjectInstantiator() { + f.registerInstantiator(SectionOption.BASE_DATA_OBJECT_TYPE + , new DomainObjectInstantiator() { protected DomainObject doNewInstance(DataObject dataObject) { return new SectionOption(dataObject); } }); - f.registerInstantiator(OptionTarget.BASE_DATA_OBJECT_TYPE, new DomainObjectInstantiator() { + f.registerInstantiator(OptionTarget.BASE_DATA_OBJECT_TYPE + , new DomainObjectInstantiator() { protected DomainObject doNewInstance(DataObject dataObject) { return new OptionTarget(dataObject); } }); } - - public DecisionTreeInitializer() { - super("ccm-ldn-camden-decisiontree.pdl.mf", DecisionTree.BASE_DATA_OBJECT_TYPE); + + @Override + public void init(ContextInitEvent evt) { + super.init(evt); + + MetadataProviderRegistry.registerAdapter( + DecisionTree.BASE_DATA_OBJECT_TYPE, + new ContentPageMetadataProvider()); } + + /** + * Retrieves fully qualified traversal adapter file name. + * @return + */ + @Override public String getTraversalXML() { return "WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/DecisionTree.xml"; } + /** + * Retrieve location of this content type's internal default theme + * stylesheet(s) which concomitantly serve as a fallback if a custom theme + * is engaged. + * + * Custom themes usually will provide their own stylesheet(s) and their own + * access method, but may not support every content type. + * + * Overwrites parent method with AgendaItem specific value for use by the + * parent class worker methods. + * + * @return String array of XSL stylesheet files of the internal default theme + */ + @Override public String[] getStylesheets() { - return new String[] { "/static/content-types/com/arsdigita/camden/cms/contenttypes/DecisionTree.xsl" }; + return new String[] { INTERNAL_THEME_TYPES_DIR + "DecisionTree.xsl" }; } } Copied: contrib/camden/ccm-lbc-decisiontree/web/themes/heirloom/contenttypes/DecisionTree.xsl (from rev 2439, contrib/camden/ccm-lbc-decisiontree/web/static/content-types/com/arsdigita/camden/cms/contenttypes/DecisionTree.xsl) =================================================================== --- contrib/camden/ccm-lbc-decisiontree/web/themes/heirloom/contenttypes/DecisionTree.xsl (rev 0) +++ contrib/camden/ccm-lbc-decisiontree/web/themes/heirloom/contenttypes/DecisionTree.xsl 2012-12-22 14:03:34 UTC (rev 2440) @@ -0,0 +1,76 @@ +<!DOCTYPE stylesheet [ +<!ENTITY nbsp " " ><!-- no-break space = non-breaking space, U+00A0 ISOnum --> +]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:cms="http://www.arsdigita.com/cms/1.0" + version="1.0"> + + <xsl:template match="cms:item[objectType='com.arsdigita.camden.cms.contenttypes.DecisionTree']" mode="cms:CT_graphics" + name="cms:CT_graphics_com_arsdigita_camden_cms_contenttypes_DecisionTree"> + <script type="text/javascript" src="/decisiontree/forms.js"> + // Placeholder to prevent the Camden templates from breaking this tag. + </script> + + <h2><xsl:value-of select="./sections/title"/></h2> + + <div><xsl:value-of select="./sections/instructions/content" disable-output-escaping="yes"/></div> + + <form action="/decisiontree/form-handler.jsp" method="GET"> + <input type="hidden" name="section_oid"> + <xsl:attribute name="value"> + <xsl:value-of select="./sections[title]/@oid"/> + </xsl:attribute> + </input> + <input type="hidden" name="return_url"> + <xsl:attribute name="value"> + <xsl:value-of select="./customInfo/@currentURL"/> + </xsl:attribute> + </input> + + <xsl:for-each select="./parameters"> + <input type="hidden"> + <xsl:attribute name="name"> + <xsl:value-of select="@name"/> + </xsl:attribute> + <xsl:attribute name="value"> + <xsl:value-of select="@value"/> + </xsl:attribute> + </input> + </xsl:for-each> + + <xsl:for-each select="./sections/sectionOptions"> + <xsl:sort select="./rank" data-type="number"/> + + <div> + <input type="radio"> + <xsl:attribute name="name"> + <xsl:value-of select="../parameterName"/> + </xsl:attribute> + <xsl:attribute name="value"> + <xsl:value-of select="./value"/> + </xsl:attribute> + <xsl:attribute name="id"> + <xsl:value-of select="@oid"/> + </xsl:attribute> + </input> + <label> + <xsl:attribute name="for"> + <xsl:value-of select="@oid"/> + </xsl:attribute> + <xsl:value-of select="./label"/> + </label> + </div> + </xsl:for-each> + + <input type="submit" name="cancel" value="Cancel"/> + <input type="submit" name="next" value="Next >" onclick="return validate(this.form)"/> + </form> + </xsl:template> + + <xsl:template match="cms:item[objectType='com.arsdigita.camden.cms.contenttypes.DecisionTree']" mode="cms:CT_text" + name="cms:CT_text_com_arsdigita_camden_cms_contenttypes_DecisionTree"> + <h1 class="mainTitle">DECISIONTREE <xsl:text disable-output-escaping="yes">&</xsl:text>gt; <xsl:value-of select="./title"/></h1> + </xsl:template> + +</xsl:stylesheet> |
|
From: <pb...@fe...> - 2012-12-22 11:10:15
|
Author: pboy Date: 2012-12-22 11:10:05 +0000 (Sat, 22 Dec 2012) New Revision: 2439 Added: contrib/camden/ccm-lbc-contentcheck/ Removed: contrib/camden/ccm-ldn-content-check/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:09:13
|
Author: pboy Date: 2012-12-22 11:09:06 +0000 (Sat, 22 Dec 2012) New Revision: 2438 Added: contrib/camden/ccm-lbc-wordxml/ Removed: contrib/camden/ccm-ldn-camden-wordxml/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:08:25
|
Author: pboy Date: 2012-12-22 11:08:14 +0000 (Sat, 22 Dec 2012) New Revision: 2437 Added: contrib/camden/ccm-lbc-retention/ Removed: contrib/camden/ccm-ldn-camden-retention/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:07:38
|
Author: pboy Date: 2012-12-22 11:07:26 +0000 (Sat, 22 Dec 2012) New Revision: 2436 Added: contrib/camden/ccm-lbc-foi/ Removed: contrib/camden/ccm-ldn-camden-foi/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:05:33
|
Author: pboy Date: 2012-12-22 11:05:24 +0000 (Sat, 22 Dec 2012) New Revision: 2435 Added: contrib/camden/ccm-lbc-eforms/ Removed: contrib/camden/ccm-ldn-camden-eforms/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:04:38
|
Author: pboy Date: 2012-12-22 11:04:26 +0000 (Sat, 22 Dec 2012) New Revision: 2434 Added: contrib/camden/ccm-lbc-decisiontree/ Removed: contrib/camden/ccm-ldn-camden-decisiontree/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:03:38
|
Author: pboy Date: 2012-12-22 11:03:29 +0000 (Sat, 22 Dec 2012) New Revision: 2433 Added: contrib/camden/ccm-lbc-consultation/ Removed: contrib/camden/ccm-ldn-camden-consultation/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:02:37
|
Author: pboy Date: 2012-12-22 11:02:28 +0000 (Sat, 22 Dec 2012) New Revision: 2432 Added: contrib/camden/ccm-lbc-aplaws/ Removed: contrib/camden/ccm-ldn-camden-aplaws/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 11:01:14
|
Author: pboy Date: 2012-12-22 11:01:04 +0000 (Sat, 22 Dec 2012) New Revision: 2431 Added: contrib/camden/ccm-lbc-aplaws-public/ Removed: contrib/camden/ccm-ldn-aplaws-camden/ Log: Adjust to naming conventions. |
|
From: <pb...@fe...> - 2012-12-22 10:11:11
|
Author: pboy
Date: 2012-12-22 10:11:00 +0000 (Sat, 22 Dec 2012)
New Revision: 2430
Modified:
contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/Initializer.java
contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/AddPortletType.java
contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortlet.java
contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletEditor.java
contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletRenderer.java
contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedFile.java
contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedMonth.java
Log:
First parft of update to version 2, fixed all syntactic errors. Not yet ready to compile!
Modified: contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/Initializer.java
===================================================================
--- contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/Initializer.java 2012-12-22 10:09:42 UTC (rev 2429)
+++ contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/Initializer.java 2012-12-22 10:11:00 UTC (rev 2430)
@@ -49,6 +49,9 @@
private static Logger s_log = Logger.getLogger
(Initializer.class.getName());
+ /**
+ * Constructor
+ */
public Initializer() {
final String url = RuntimeConfig.getConfig().getJDBCURL();
final int database = DbHelper.getDatabaseFromURL(url);
Modified: contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/AddPortletType.java
===================================================================
--- contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/AddPortletType.java 2012-12-22 10:09:42 UTC (rev 2429)
+++ contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/AddPortletType.java 2012-12-22 10:11:00 UTC (rev 2430)
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001-2012 London Borough of Camden 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
+ */
+
package uk.gov.camden.aplaws.intranet.portal;
import org.apache.commons.cli.CommandLine;
@@ -5,7 +23,7 @@
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelExcursion;
-import com.arsdigita.london.util.Program;
+import com.arsdigita.util.cmd.Program;
import com.arsdigita.london.util.Transaction;
import com.arsdigita.portal.PortletType;
Modified: contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortlet.java
===================================================================
--- contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortlet.java 2012-12-22 10:09:42 UTC (rev 2429)
+++ contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortlet.java 2012-12-22 10:11:00 UTC (rev 2430)
@@ -1,15 +1,36 @@
+/*
+ * Copyright (C) 2001-2012 London Borough of Camden 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
+ */
+
package uk.gov.camden.aplaws.intranet.portal;
-import javax.servlet.http.HttpServletRequest;
-
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.navigation.DataCollectionDefinition;
-import com.arsdigita.london.navigation.portlet.ItemListPortlet;
+import com.arsdigita.navigation.DataCollectionDefinition;
+import com.arsdigita.navigation.portlet.ItemListPortlet;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.util.StringUtils;
import com.arsdigita.web.Web;
+import javax.servlet.http.HttpServletRequest;
+/**
+ *
+ * @author unkown
+ */
public class FilteredItemListPortlet extends ItemListPortlet {
public static final String BASE_DATA_OBJECT_TYPE =
@@ -17,10 +38,18 @@
public static final String CUSTOM_FILTER = "customFilter";
+ /**
+ *
+ * @param dobj
+ */
public FilteredItemListPortlet(DataObject dobj) {
super(dobj);
}
+ /**
+ *
+ * @param customFilter
+ */
public void setCustomFilter(String customFilter) {
set(CUSTOM_FILTER, customFilter);
}
@@ -28,6 +57,7 @@
/**
* Apply custom column sorting from the request parameter.
*/
+ @Override
public String getOrdering() {
String ordering = super.getOrdering();
HttpServletRequest req = Web.getRequest();
@@ -45,14 +75,29 @@
return ordering;
}
+ /**
+ *
+ * @return
+ */
public String getCustomFilter() {
return (String)get(CUSTOM_FILTER);
}
+
+ /**
+ *
+ * @return
+ */
+ @Override
protected DataCollectionDefinition newDataCollectionDefinition() {
return new FilteredCMSDataCollectionDefinition();
}
+ /**
+ *
+ * @return
+ */
+ @Override
public DataCollectionDefinition getDataCollectionDefinition() {
FilteredCMSDataCollectionDefinition def = (FilteredCMSDataCollectionDefinition)
super.getDataCollectionDefinition();
@@ -62,6 +107,11 @@
return def;
}
+ /**
+ *
+ * @return
+ */
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new FilteredItemListPortletRenderer(this);
}
Modified: contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletEditor.java
===================================================================
--- contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletEditor.java 2012-12-22 10:09:42 UTC (rev 2429)
+++ contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletEditor.java 2012-12-22 10:11:00 UTC (rev 2430)
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001-2012 London Borough of Camden 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
+ */
+
package uk.gov.camden.aplaws.intranet.portal;
import java.util.TooManyListenersException;
@@ -21,25 +39,41 @@
import com.arsdigita.cms.ContentTypeCollection;
import com.arsdigita.cms.contentassets.FileAttachment;
import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.london.navigation.portlet.ItemListPortlet;
-import com.arsdigita.london.navigation.ui.portlet.ItemListPortletEditor;
-import com.arsdigita.london.navigation.ui.portlet.ItemListPortletEditor.ItemTypePrintListener;
+import com.arsdigita.navigation.portlet.ItemListPortlet;
+import com.arsdigita.navigation.ui.portlet.ItemListPortletEditor;
+import com.arsdigita.navigation.ui.portlet.ItemListPortletEditor.ItemTypePrintListener;
import com.arsdigita.portal.Portlet;
import com.arsdigita.util.UncheckedWrapperException;
+/**
+ *
+ *
+ */
public class FilteredItemListPortletEditor extends ItemListPortletEditor {
private TextField customFilter;
+ /**
+ *
+ * @param resType
+ * @param parentAppRL
+ */
public FilteredItemListPortletEditor(ResourceType resType,
RequestLocal parentAppRL) {
super(resType, parentAppRL);
}
+ /**
+ *
+ * @param application
+ */
public FilteredItemListPortletEditor(RequestLocal application) {
super(application);
}
+ /**
+ *
+ */
protected void addWidgets() {
super.addWidgets();
@@ -48,14 +82,28 @@
add(customFilter);
}
+ /**
+ *
+ * @return
+ */
protected PrintListener getBaseObjectTypes() {
return new FAItemTypePrintListener(true);
}
+ /**
+ *
+ * @return
+ */
protected PrintListener getRestrictedObjectTypes() {
return new FAItemTypePrintListener(false);
}
+ /**
+ *
+ * @param state
+ * @param portlet
+ * @throws FormProcessException
+ */
protected void initWidgets(PageState state,
Portlet portlet)
throws FormProcessException {
@@ -69,6 +117,12 @@
}
}
+ /**
+ *
+ * @param state
+ * @param portlet
+ * @throws FormProcessException
+ */
protected void processWidgets(PageState state,
Portlet portlet)
throws FormProcessException {
@@ -78,12 +132,23 @@
myportlet.setCustomFilter((String)customFilter.getValue(state));
}
+ /**
+ *
+ */
public static class FAItemTypePrintListener extends ItemTypePrintListener {
+ /**
+ *
+ * @param all
+ */
public FAItemTypePrintListener(boolean all) {
super(all);
}
+ /**
+ *
+ * @param ev
+ */
public void prepare(PrintEvent ev) {
super.prepare(ev);
OptionGroup target = (OptionGroup)ev.getTarget();
Modified: contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletRenderer.java
===================================================================
--- contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletRenderer.java 2012-12-22 10:09:42 UTC (rev 2429)
+++ contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/FilteredItemListPortletRenderer.java 2012-12-22 10:11:00 UTC (rev 2430)
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001-2012 London Borough of Camden 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
+ */
+
package uk.gov.camden.aplaws.intranet.portal;
import javax.servlet.http.HttpServletRequest;
@@ -4,25 +22,42 @@
import org.apache.log4j.Logger;
-import com.arsdigita.london.navigation.DataCollectionRenderer;
-import com.arsdigita.london.navigation.ui.portlet.ItemListPortletRenderer;
+import com.arsdigita.navigation.DataCollectionRenderer;
+import com.arsdigita.navigation.ui.portlet.ItemListPortletRenderer;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.Web;
import com.arsdigita.xml.Element;
+/**
+ *
+ * @author unknown
+ */
public class FilteredItemListPortletRenderer extends ItemListPortletRenderer {
private static final Logger s_log =
Logger.getLogger(FilteredItemListPortletRenderer.class);
+ /**
+ *
+ * @param portlet
+ */
public FilteredItemListPortletRenderer(FilteredItemListPortlet portlet) {
super(portlet);
}
+
+ /**
+ *
+ * @return
+ */
protected DataCollectionRenderer newDataCollectionRenderer() {
return new DataCollectionRenderer();
}
+ /**
+ *
+ * @return
+ */
protected int getPageNumber() {
HttpServletRequest req = Web.getRequest();
int pageNumber = 1;
Modified: contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedFile.java
===================================================================
--- contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedFile.java 2012-12-22 10:09:42 UTC (rev 2429)
+++ contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedFile.java 2012-12-22 10:11:00 UTC (rev 2430)
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2001-2012 London Borough of Camden 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
+ */
+
package uk.gov.camden.aplaws.intranet.portal;
import java.math.BigDecimal;
@@ -13,10 +31,14 @@
import com.arsdigita.cms.contentassets.FileAttachment;
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
import com.arsdigita.domain.DomainObjectXMLRenderer;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractComponent;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.AbstractComponent;
import com.arsdigita.xml.Element;
+/**
+ *
+ *
+ */
public class SelectedFile extends AbstractComponent {
private String paramName;
@@ -24,11 +46,20 @@
private static final Logger s_log =
Logger.getLogger(SelectedFile.class);
+ /**
+ *
+ */
public void setParamName(String paramName) {
// Assert !isLocked()
this.paramName = paramName;
}
+ /**
+ *
+ * @param request
+ * @param response
+ * @return
+ */
public Element generateXML(HttpServletRequest request,
HttpServletResponse response) {
Modified: contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedMonth.java
===================================================================
--- contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedMonth.java 2012-12-22 10:09:42 UTC (rev 2429)
+++ contrib/camden/ccm-ldn-camden-aplaws/src/uk/gov/camden/aplaws/intranet/portal/SelectedMonth.java 2012-12-22 10:11:00 UTC (rev 2430)
@@ -1,5 +1,29 @@
+/*
+ * Copyright (C) 2001-2012 London Borough of Camden 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
+ */
+
package uk.gov.camden.aplaws.intranet.portal;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.AbstractComponent;
+import com.arsdigita.persistence.DataQuery;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.xml.Element;
+
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
@@ -9,12 +33,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractComponent;
-import com.arsdigita.persistence.DataQuery;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.xml.Element;
+/**
+ *
+ *
+ */
public class SelectedMonth extends AbstractComponent {
private String paramName;
@@ -38,6 +61,12 @@
this.catID = new BigDecimal(filterCategoryID);
}
+ /**
+ *
+ * @param request
+ * @param response
+ * @return
+ */
public Element generateXML(HttpServletRequest request, HttpServletResponse response) {
// example output:
// <nav:calendar firstWeekday="2" id="calendar" lastDay="31" month="1" [day="19"] year="2007"
|
|
From: <pb...@fe...> - 2012-12-22 10:09:52
|
Author: pboy
Date: 2012-12-22 10:09:42 +0000 (Sat, 22 Dec 2012)
New Revision: 2429
Modified:
contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java
contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationLoader.java
contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationUtil.java
contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsList.java
contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsNavigationModel.java
contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java
Log:
First parft of update to version 2, fixed all syntactic errors.
Modified: contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java
===================================================================
--- contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java 2012-12-19 00:18:22 UTC (rev 2428)
+++ contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationInitializer.java 2012-12-22 10:09:42 UTC (rev 2429)
@@ -24,7 +24,8 @@
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TransactionContext;
-import com.arsdigita.runtime.LegacyInitEvent;
+import com.arsdigita.runtime.ContextCloseEvent;
+import com.arsdigita.runtime.ContextInitEvent;
import com.arsdigita.search.MetadataProviderRegistry;
import java.util.Calendar;
import java.util.Date;
@@ -33,17 +34,23 @@
import org.apache.log4j.Logger;
/**
- * Runtime initialization for the Consultations content type.
+ * Runtime initialization for the Consultations content type, executes at
+ * each system startup.
+ *
+ * Defines the content type specific properties and just uses the super class
+ * methods to register the content type with the (transient) content type store
+ * (map). This is done by runtimeRuntime startup method which runs the init()
+ * methods of all initializers (this one just using the parent implementation).
*
* @author Carsten Clasohm
* @version $Id: ConsultationInitializer.java 24 2005-08-02 14:14:14Z clasohm $
*/
public class ConsultationInitializer extends ContentTypeInitializer {
+
+ /** Private Logger instance for debugging purpose. */
private static final Logger s_log =
Logger.getLogger(ConsultationInitializer.class);
- public final static String versionId = "$Id: ConsultationInitializer.java 24 2005-08-02 14:14:14Z clasohm $";
-
// The time at which alerts are sent each day.
public final static int ALERT_HOUR = 5;
public final static int ALERT_MINUTE = 12;
@@ -51,7 +58,22 @@
public final static int SMS_ALERT_HOUR = 9;
public final static int SMS_ALERT_MINUTE = 1;
- public void init(LegacyInitEvent evt) {
+ /**
+ * Constructor, sets the PDL manifest file and object type string.
+ */
+ public ConsultationInitializer() {
+ super("ccm-ldn-camden-consultation.pdl.mf",
+ Consultation.BASE_DATA_OBJECT_TYPE);
+ }
+
+ /**
+ * Implementation of the {@link Initializer#init(ContextInitEvent)}
+ * method used to setup and start background threads .
+ *
+ * @param evt The context init event.
+ */
+ @Override
+ public void init(ContextInitEvent evt) {
super.init(evt);
MetadataProviderRegistry.registerAdapter(
@@ -59,12 +81,13 @@
new ConsultationMetadataProvider());
if(ConsultationUtil.getConfig().getAlertsEnabledStatus()) {
- // Schedule our timer at the given alert time. If we are already past this time,
- // the first run is scheduled for tomorrow morning.
+ // Schedule our timer at the given alert time. If we are already
+ // past this time, the first run is scheduled for tomorrow morning.
Calendar cal = Calendar.getInstance();
int hourOfDay = cal.get(Calendar.HOUR_OF_DAY);
int minute = cal.get(Calendar.MINUTE);
- if (hourOfDay > ALERT_HOUR || hourOfDay == ALERT_HOUR && minute >= ALERT_MINUTE)
+ if (hourOfDay > ALERT_HOUR || hourOfDay == ALERT_HOUR
+ && minute >= ALERT_MINUTE)
cal.add(Calendar.DATE, 1);
cal.set(Calendar.HOUR_OF_DAY, ALERT_HOUR);
cal.set(Calendar.MINUTE, ALERT_MINUTE);
@@ -92,7 +115,8 @@
Calendar cal2 = Calendar.getInstance();
hourOfDay = cal2.get(Calendar.HOUR_OF_DAY);
minute = cal2.get(Calendar.MINUTE);
- if (hourOfDay > SMS_ALERT_HOUR || hourOfDay == SMS_ALERT_HOUR && minute >= SMS_ALERT_MINUTE)
+ if (hourOfDay > SMS_ALERT_HOUR || hourOfDay == SMS_ALERT_HOUR
+ && minute >= SMS_ALERT_MINUTE)
cal2.add(Calendar.DATE, 1);
cal2.set(Calendar.HOUR_OF_DAY, SMS_ALERT_HOUR);
cal2.set(Calendar.MINUTE, SMS_ALERT_MINUTE);
@@ -116,15 +140,44 @@
}
}
- public ConsultationInitializer() {
- super("ccm-ldn-camden-consultation.pdl.mf", Consultation.BASE_DATA_OBJECT_TYPE);
+ /**
+ * Implementation of the {@link Initializer#close()} method.
+ *
+ * @param evt The ContextClose init event.
+ */
+ @Override
+ public void close(ContextCloseEvent evt) {
+
+ // TODO: Stop timer at system shutdown
+
}
+ /**
+ *
+ * @return
+ */
+ @Override
public String getTraversalXML() {
return "WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Consultation.xml";
}
+
+ /**
+ * Retrieve location of this content type's internal default theme
+ * stylesheet(s) which concomitantly serve as a fallback if a custom theme
+ * is engaged.
+ *
+ * Custom themes usually will provide their own stylesheet(s) and their own
+ * access method, but may not support every content type.
+ *
+ * Overwrites parent method with AgendaItem specific value for use by the
+ * parent class worker methods.
+ *
+ * @return String array of XSL stylesheet files of the internal default theme
+ */
+ @Override
public String[] getStylesheets() {
- return new String[] { "/static/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xsl" };
+ return new String[]
+ { "/static/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xsl" };
}
}
Modified: contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationLoader.java
===================================================================
--- contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationLoader.java 2012-12-19 00:18:22 UTC (rev 2428)
+++ contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationLoader.java 2012-12-22 10:09:42 UTC (rev 2429)
@@ -23,21 +23,23 @@
import com.arsdigita.kernel.ACSObjectInstantiator;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelExcursion;
-import com.arsdigita.london.navigation.Template;
+import com.arsdigita.navigation.Template;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.runtime.ScriptContext;
import com.arsdigita.web.Application;
-import com.arsdigita.web.ApplicationSetup;
+// import com.arsdigita.web.ApplicationSetup;
import com.arsdigita.web.ApplicationType;
/**
* Intializes the database after the Consultations data model has been created.
*
+ * Executes nonrecurring at install time and loads (installs and initializes)
+ * the ccm-ldn-camden-consultation package persistently into database.
+ *
* @author Carsten Clasohm
* @version $Id: ConsultationLoader.java 31 2005-08-04 15:56:42Z clasohm $
*/
public class ConsultationLoader extends AbstractContentTypeLoader {
- public final static String versionId = "$Id: ConsultationLoader.java 31 2005-08-04 15:56:42Z clasohm $";
private static final String[] TYPES = {
"/WEB-INF/content-types/com/arsdigita/camden/cms/contenttypes/Consultation.xml"
@@ -47,6 +49,12 @@
return TYPES;
}
+ /**
+ * Run script invoked by com.arsdigita.packing loader script.
+ *
+ * @param ctx
+ */
+ @Override
public void run(ScriptContext ctx) {
super.run(ctx);
@@ -66,6 +74,7 @@
}
private void setupApplication() {
+/*
ApplicationSetup setup = new ApplicationSetup(s_log);
setup.setApplicationObjectType(
@@ -75,13 +84,19 @@
setup.setDescription("Consultations");
setup.setSingleton(true);
setup.setInstantiator(new ACSObjectInstantiator() {
+ @Override
public DomainObject doNewInstance(DataObject dataObject) {
return new ConsultationApp(dataObject);
}
});
ApplicationType type = setup.run();
type.save();
-
+*/
+ ApplicationType type = new ApplicationType(
+ "Consultations",
+ ConsultationApp.BASE_DATA_OBJECT_TYPE );
+ type.setDescription("Provides Consultations service");
+
ConsultationApp app = (ConsultationApp)
Application.createApplication(type,
"consultations",
Modified: contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationUtil.java
===================================================================
--- contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationUtil.java 2012-12-19 00:18:22 UTC (rev 2428)
+++ contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ConsultationUtil.java 2012-12-22 10:09:42 UTC (rev 2429)
@@ -26,10 +26,10 @@
import com.arsdigita.categorization.CategoryCollection;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.Kernel;
-import com.arsdigita.london.rss.RSS;
import com.arsdigita.mail.Mail;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.rssfeed.RSSFeed;
import com.arsdigita.web.Application;
import com.arsdigita.web.ParameterMap;
import com.arsdigita.web.URL;
@@ -133,10 +133,11 @@
*/
private static BigDecimal initRSSCategory() {
DataCollection apps =
- SessionManager.getSession().retrieve(RSS.BASE_DATA_OBJECT_TYPE);
+ SessionManager.getSession().retrieve(RSSFeed.BASE_DATA_OBJECT_TYPE);
- if (!apps.next())
+ if (!apps.next()) {
return null;
+ }
Application app = Application.retrieveApplication(apps.getDataObject());
apps.close();
@@ -144,8 +145,9 @@
BigDecimal result = null;
Category rootCategory = Category.getRootForObject(app);
- if (rootCategory == null)
+ if (rootCategory == null) {
return null;
+ }
String consultationsTermURL = getConfig().getConsultationsTermURL();
Modified: contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsList.java
===================================================================
--- contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsList.java 2012-12-19 00:18:22 UTC (rev 2428)
+++ contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsList.java 2012-12-22 10:09:42 UTC (rev 2429)
@@ -18,21 +18,20 @@
*/
package com.arsdigita.camden.cms.contenttypes.ui;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import com.arsdigita.camden.cms.contenttypes.Consultation;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.DataCollectionRenderer;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.ui.AbstractObjectList;
+import com.arsdigita.navigation.DataCollectionRenderer;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.ui.AbstractObjectList;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.DataQueryDataCollectionAdapter;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.xml.Element;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* To be used as a component in a JSP page, this class displays the latest
@@ -45,16 +44,21 @@
private int m_maxCount = 5;
+ /**
+ * Constructor.
+ */
public ConsultationsList() {
// We need a custom renderer to display the consultation status,
// which is dynamically computed and not stored in the database.
DataCollectionRenderer renderer = new DataCollectionRenderer() {
+ @Override
protected void generateItemXML(Element item, DataObject dobj,
ACSObject obj, int index) {
Consultation consultation = (Consultation) obj;
GlobalizedMessage status = consultation.getStatus();
- if (status == null)
- return;
+ if (status == null) {
+ return;
+ }
Element attribute = Navigation.newElement("attribute");
attribute.addAttribute("name", "status");
@@ -83,6 +87,13 @@
getRenderer().setPageSize(m_maxCount);
}
+ /**
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @Override
protected DataCollection getObjects(HttpServletRequest request,
HttpServletResponse response) {
DataQuery query = SessionManager.getSession().retrieveQuery(
@@ -91,6 +102,12 @@
return new DataQueryDataCollectionAdapter(query, "consultation");
}
+ /**
+ *
+ * @param request
+ * @param response
+ * @return
+ */
public Element generateXML(HttpServletRequest request,
HttpServletResponse response) {
Element content = Navigation.newElement("simpleObjectList");
Modified: contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsNavigationModel.java
===================================================================
--- contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsNavigationModel.java 2012-12-19 00:18:22 UTC (rev 2428)
+++ contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsNavigationModel.java 2012-12-22 10:09:42 UTC (rev 2429)
@@ -1,13 +1,12 @@
package com.arsdigita.camden.cms.contenttypes.ui;
-import java.lang.reflect.Array;
-
import com.arsdigita.camden.cms.contenttypes.ConsultationApp;
import com.arsdigita.camden.cms.contenttypes.ConsultationUtil;
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection;
import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.AbstractNavigationModel;
+import com.arsdigita.navigation.AbstractNavigationModel;
+import java.lang.reflect.Array;
/**
* <p>NavigationModel to be used by the Camden Consultations JSPs.
@@ -40,8 +39,9 @@
private ConsultationsNavigationModel() {
ConsultationApp app = ConsultationApp.retrieveApplication();
- if (app != null)
+ if (app != null) {
m_rootCategory = Category.getRootForObject(app);
+ }
if (m_rootCategory != null) {
String consultationsTermUrl =
@@ -65,8 +65,9 @@
}
protected Category[] loadCategoryPath() {
- if (m_tipCategory == null)
+ if (m_tipCategory == null) {
return null;
+ }
CategoryCollection ascendants =
loadCategory().getDefaultAscendants();
@@ -85,8 +86,9 @@
}
static public ConsultationsNavigationModel retrieve() {
- if (m_model == null)
+ if (m_model == null) {
m_model = new ConsultationsNavigationModel();
+ }
return m_model;
}
Modified: contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java
===================================================================
--- contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java 2012-12-19 00:18:22 UTC (rev 2428)
+++ contrib/camden/ccm-ldn-camden-consultation/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java 2012-12-22 10:09:42 UTC (rev 2429)
@@ -18,8 +18,6 @@
*/
package com.arsdigita.camden.cms.contenttypes.ui;
-import java.math.BigDecimal;
-
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.Link;
@@ -33,7 +31,7 @@
import com.arsdigita.camden.cms.contenttypes.ConsultationUtil;
import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentPage;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.SessionManager;
@@ -46,6 +44,7 @@
import com.arsdigita.web.ParameterMap;
import com.arsdigita.web.URL;
import com.arsdigita.web.Web;
+import java.math.BigDecimal;
/**
* To be used as a component in a JSP page, this class displays all published
@@ -139,12 +138,16 @@
PageState s = e.getPageState();
String filter = (String)s.getValue(m_filter);
- if (ConsultationsFilter.FILTER_PAST.equals(filter))
+ if (ConsultationsFilter.FILTER_PAST.equals(filter)) {
q.addFilter("completionDate < current_date");
- else if (ConsultationsFilter.FILTER_CURRENT.equals(filter))
- q.addFilter("startDate <= current_date and completionDate >= current_date");
- else if (ConsultationsFilter.FILTER_FORTHCOMING.equals(filter))
+ }
+ else if (ConsultationsFilter.FILTER_CURRENT.equals(filter)) {
+ q.addFilter("startDate <= current_date "
+ + "and completionDate >= current_date");
+ }
+ else if (ConsultationsFilter.FILTER_FORTHCOMING.equals(filter)) {
q.addFilter("startDate > current_date");
+ }
}
});
@@ -153,6 +156,7 @@
/**
* Register the ordering parameter
*/
+ @Override
public void register(Page p) {
super.register(p);
@@ -166,6 +170,7 @@
* @return the order by which the currently selected column will be sorted;
* will be either ASCENDING or DESCENDING
*/
+ @Override
public String getOrderDirection(PageState s) {
return (String) s.getValue(m_dirParam);
}
@@ -179,6 +184,7 @@
* the direction in which the current column should be sorted;
* either ASCENDING or DESCENDING
*/
+ @Override
public void setOrderDirection(PageState s, String dir) {
Assert.truth(ASCENDING.equals(dir) || DESCENDING.equals(dir),
"invalid sort direction");
@@ -193,7 +199,7 @@
* either ASCENDING or DESCENDING
*/
public void setDefaultOrderDirection(String dir) {
- Assert.unlocked(this);
+ Assert.isUnlocked(this);
m_dirParam.setDefaultValue(dir);
}
@@ -204,8 +210,9 @@
// to reset the paginator, because the number of
// items will have changed.
Paginator paginator = getPaginator();
- if (paginator != null)
+ if (paginator != null) {
paginator.reset(state);
+ }
}
public String getFilter(PageState state) {
|
Author: pboy
Date: 2012-12-19 00:18:22 +0000 (Wed, 19 Dec 2012)
New Revision: 2428
Added:
releases/2.0.0/ccm-bundle/sql/ccm-bundle/
releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/
releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/
releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/
releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
releases/2.0.0/ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/oracle-se-create.sql
Removed:
releases/2.0.0/ccm-bundle/sql/upgrade/
Modified:
releases/2.0.0/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java
Log:
Fixed upgrade scripts (db sql) (backport r2424, r2426) (on behalf of JensP)
Added: releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
===================================================================
--- releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql (rev 0)
+++ releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql 2012-12-19 00:18:22 UTC (rev 2428)
@@ -0,0 +1,92 @@
+--
+-- Copyright (C) 2011 Peter Boy 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
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: upd_nav_templates_table pboy $
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+-- Update new path
+update nav_templates
+ set url=replace(url,'packages/navigation/templates'
+ ,'templates/ccm-navigation/navigation')
+ where url like '%packages/navigation/templates%';
+
+
+-- AAP: update jsp names
+update nav_templates
+ set url=replace(url,'aap-atoz','sci-atoz'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-atoz%';
+
+update nav_templates
+ set url=replace(url,'aap-default' ,'sci-default'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-default%';
+
+update nav_templates
+ set url=replace(url,'aap-portal' ,'sci-portal'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-portal%';
+
+update nav_templates
+ set url=replace(url,'aap-recent' ,'sci-recent'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-recent%';
+
+update nav_templates
+ set url=replace(url,'aap-welcome' ,'sci-welcome'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-welcome%';
+
+
+-- IAW: update jsp names
+update nav_templates
+ set url=replace(url,'iaw-atoz','sci-atoz'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-atoz%';
+
+update nav_templates
+ set url=replace(url,'iaw-default' ,'sci-default'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-default%';
+
+update nav_templates
+ set url=replace(url,'iaw-portal' ,'sci-portal'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-portal%';
+
+update nav_templates
+ set url=replace(url,'iaw-recent' ,'sci-recent'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-recent%';
+
+update nav_templates
+ set url=replace(url,'iaw-welcome' ,'sci-welcome'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-welcome%';
Added: releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
===================================================================
--- releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql (rev 0)
+++ releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql 2012-12-19 00:18:22 UTC (rev 2428)
@@ -0,0 +1,68 @@
+--
+-- Copyright (C) 2011 Peter Boy 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: upd_system_tables.sql pboy $
+
+-- adjust various system tables to the new name of application (ccm-sci-bundle)
+
+alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
+
+alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
+
+update inits
+ set class_name=replace(class_name,'arsdigita.aplaws', 'arsdigita.bundle')
+ where class_name like '%arsdigita.aplaws%' ;
+
+update init_requirements
+ set init=replace(init,'arsdigita.aplaws', 'arsdigita.bundle')
+ where init like '%arsdigita.aplaws%' ;
+
+update init_requirements
+ set required_init=replace(required_init,'arsdigita.aplaws', 'arsdigita.bundle')
+ where required_init like '%arsdigita.aplaws%' ;
+
+ALTER TABLE ONLY init_requirements
+ ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
+ REFERENCES inits (class_name) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+ALTER TABLE init_requirements
+ ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+ REFERENCES inits (class_name) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+
+-- update application_types
+-- set object_type=replace(object_type,'london.portal', 'portalworkspace')
+-- where object_type like '%london.portal%' ;
+
+-- table applications doesn't require an update
+
+-- update apm_package_types
+-- set package_key=replace(package_key,'workspace', 'portalworkspace')
+-- where package_key like 'workspace' ;
+
+-- table apm_packages doesn't require an update either
+-- table site_nodes doesn't require an update either
+
+
+-- update application type in acs_objects
+update acs_objects
+ set (object_type,default_domain_class) =
+ (replace(object_type,'arsdigita.aplaws', 'arsdigita.bundle') ,
+ replace(default_domain_class,'arsdigita.aplaws', 'arsdigita.bundle') )
+ where object_type like '%arsdigita.aplaws%' ;
Added: releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
===================================================================
--- releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql (rev 0)
+++ releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql 2012-12-19 00:18:22 UTC (rev 2428)
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2011 Peter Boy 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
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: oracle-se-0.0.0-6.6.0 pboy $
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+@@ default/0.0.0-6.6.0/upd_system_tables.sql
+@@ default/0.0.0-6.6.0/upd_nav_templates_table.sql
+
Added: releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
===================================================================
--- releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql (rev 0)
+++ releases/2.0.0/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql 2012-12-19 00:18:22 UTC (rev 2428)
@@ -0,0 +1,31 @@
+--
+-- Copyright (C) 2011 Peter Boy 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
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: postgres-0.0.0-6.6.0 pboy $
+
+\echo Red Hat Enterprise ccm-sci-bundle 0.0.0 -> 6.6.0 Upgrade Script (PostgreSQL)
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+begin;
+
+\i default/0.0.0-6.6.0/upd_system_tables.sql
+\i default/0.0.0-6.6.0/upd_nav_templates_table.sql
+
+commit;
Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java 2012-12-18 23:13:16 UTC (rev 2427)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java 2012-12-19 00:18:22 UTC (rev 2428)
@@ -26,14 +26,13 @@
import com.arsdigita.kernel.PackageType;
import com.arsdigita.kernel.Resource;
import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.util.cmd.Program;
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TransactionContext;
import com.arsdigita.util.StringUtils;
+import com.arsdigita.util.cmd.Program;
import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationType;
-
import org.apache.commons.cli.CommandLine;
import org.apache.log4j.Logger;
@@ -93,7 +92,8 @@
ApplicationType appType = null;
appType = Loader.loadWorkspaceApplicationType();
// get corresponding package type
- PackageType packageType = appType.getPackageType();
+ //PackageType packageType = appType.getPackageType();
+ PackageType packageType = PackageType.findByKey("content-center");
// get all installed instances
PackageInstanceCollection allPackages = packageType
.getInstances();
@@ -119,7 +119,8 @@
appType = null;
appType = Loader.loadServiceApplicationType();
// get corresponding package type
- packageType = appType.getPackageType();
+ //packageType = appType.getPackageType();
+ packageType = PackageType.findByKey("cms-service");
// get all installed instances
allPackages = packageType.getInstances();
aPackage = null ;
Modified: releases/2.0.0/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
===================================================================
--- releases/2.0.0/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql 2012-12-18 23:13:16 UTC (rev 2427)
+++ releases/2.0.0/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql 2012-12-19 00:18:22 UTC (rev 2428)
@@ -21,9 +21,9 @@
begin;
-\i ../default/upgrade/6.6.0-6.6.1/drop_constraints_ct_addresses.sql
+\i ../default/upgrade/6.6.0-6.6.1/drop_constraints_ct_adresses.sql
\i ../default/upgrade/6.6.0-6.6.1/upd_table_iso_countries.sql
-\i ../default/upgrade/6.6.0-6.6.1/upd_table_ct_addresses.sql
+\i ../default/upgrade/6.6.0-6.6.1/upd_table_ct_address.sql
\i ../default/upgrade/6.6.0-6.6.1/upd_system_tables.sql
Added: releases/2.0.0/ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/oracle-se-create.sql
===================================================================
--- releases/2.0.0/ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/oracle-se-create.sql (rev 0)
+++ releases/2.0.0/ccm-cms-types-simpleorganization/sql/ccm-cms-types-simpleorganization/oracle-se-create.sql 2012-12-19 00:18:22 UTC (rev 2428)
@@ -0,0 +1,3 @@
+@ ddl/oracle-se/create.sql
+
+@ ddl/oracle-se/deferred.sql
\ No newline at end of file
|
|
From: <pb...@fe...> - 2012-12-18 23:13:26
|
Author: pboy
Date: 2012-12-18 23:13:16 +0000 (Tue, 18 Dec 2012)
New Revision: 2427
Modified:
trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html
trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js
trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/de.js
trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/en.js
Log:
Further improvements Xinha OpenCCM plugin (version 0.5). (on behalf of quasimodo)
Modified: trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html
===================================================================
--- trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html 2012-12-18 22:51:03 UTC (rev 2426)
+++ trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html 2012-12-18 23:13:16 UTC (rev 2427)
@@ -121,7 +121,7 @@
</label>
<div class="value">
<select size="1" name="[alignment]" id="[alignment]" title="_(Positioning of this image)">
- <option value="" ><l10n>Not set</l10n></option>
+ <option value="none" ><l10n>Not set</l10n></option>
<option value="left" ><l10n>Left</l10n></option>
<option value="center"><l10n>Center</l10n></option>
<option value="right" ><l10n>Right</l10n></option>
@@ -133,18 +133,16 @@
<div class="value">
<input type="checkbox" name="[caption]" id="[caption]" title="_(Show caption)" checked="checked"/>
</div>
- <label class="key" for="[zoom]">
- <l10n>Enable Zoom:</l10n>
+ <label class="key" for="[fancybox]">
+ <l10n>Fancybox:</l10n>
</label>
<div class="value">
- <input type="checkbox" name="[zoom]" id="[zoom]" title="_(Enable zoom)"/>
+ <select size="1" name="[fancybox]" id="[fancybox]" title="_()">
+ <option value="none" ><l10n>None</l10n></option>
+ <option value="imageZoom" ><l10n>Zoom</l10n></option>
+ <option value="imageGallery"><l10n>Gallery</l10n></option>
+ </select>
</div>
- <label class="key" for="[gallery]">
- <l10n>Enable Gallery:</l10n>
- </label>
- <div class="value">
- <input type="checkbox" name="[gallery]" id="[gallery]" title="_(Enable gallery)"/>
- </div>
</fieldset>
<fieldset id="[dimensions]">
Modified: trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js
===================================================================
--- trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js 2012-12-18 22:51:03 UTC (rev 2426)
+++ trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js 2012-12-18 23:13:16 UTC (rev 2427)
@@ -17,8 +17,11 @@
width : "",
height : "",
caption : "",
- zoom : "",
- gallery : "",
+
+ alignment : "",
+ caption : "",
+ fancybox : "",
+
aspect : ""
};
@@ -33,7 +36,7 @@
this.image = image;
- if(image && image.tagName.toLowerCase() == "img")
+ if (image && image.tagName.toLowerCase() == "img")
{
data.src = this.editor.fixRelativeLinks(image.getAttribute("src"));
data.alt = image.getAttribute("alt");
@@ -42,35 +45,50 @@
data.width = image.getAttribute("width");
data.height = image.getAttribute("height");
- if(image.parentNode.tagName.toLowerCase() == "div")
+ if (image.parentNode.tagName.toLowerCase() == "div")
{
// Parent node is not a link, so there is not zoom or gallery function
- data.alignment = image.parentNode.getAttribute("class").substring(image.parentNode.getAttribute("class").indexOf(" "));
+ alignment = image.parentNode.getAttribute("class");
+ if (alignment != "image none")
+ {
+ data.alignment = alignment.substring(alignment.indexOf(" ") + 1);
+ }
+ else
+ {
+ data.alignment = "none";
+ }
data.caption = (image.nextSibling.tagName.toLowerCase() == "span" && image.nextSibling.firstChild) ? image.nextSibling.firstChild.nodeValue : "";
- data.zoom = "";
- data.gallery = "";
+
+ data.fancybox = "none";
// data.galleryName = "";
}
else
{
// Parent node is a link
- data.alignment = image.parentNode.parentNode.getAttribute("class").substring(image.parentNode.getAttribute("class").indexOf(" "));
- data.zoom = (image.parentNode.getAttribute("class") == "imageZoom") ? "on" : "";
- data.gallery = (image.parentNode.getAttribute("class") == "imageGallery") ? "on" : "";
+ alignment = image.parentNode.parentNode.getAttribute("class");
+ if (alignment != "image none")
+ {
+ data.alignment = alignment.substring(alignment.indexOf(" ") + 1);
+ }
+ else
+ {
+ data.alignment="none";
+ }
+
+ data.fancybox = image.parentNode.getAttribute("class");
// data.galleryName = (image.parentNode.getAttribute("class") == "imageGallery") ? image.parentNode.getAttribute("rel") : "";
data.caption = (image.parentNode.nextSibling.tagName.toLowerCase() == "span" && image.parentNode.nextSibling.firstChild) ? image.parentNode.nextSibling.firstChild.nodeValue : "";
}
-
+
// Calculate aspect ratio
data.aspect = data.width / data.height;
}
else
{
- data.alignment = "";
+ data.alignment = "none";
// data.caption = "";
- data.zoom = "";
- data.gallery = "";
+ data.fancybox = "none";
// data.galleryName = "";
}
@@ -151,7 +169,6 @@
href : "",
rel : "",
class : ""
-
};
var divAttr =
@@ -181,20 +198,18 @@
}
// Read form values for link
- if(values.zoom || values.gallery)
+ if(values.fancybox.value == "imageZoom")
{
linkAttr.href = values.src;
- if(values.zoom)
- {
- linkAttr.rel = "";
- linkAttr.class = "imageZoom";
- }
+ linkAttr.rel = "";
+ linkAttr.class = "imageZoom";
+ }
- else if(values.gallery)
- {
- linkAttr.rel = "imageGallery";
- linkAttr.class = "imageGallery";
- }
+ else if(values.fancybox.value == "imageGallery")
+ {
+ linkAttr.href = values.src;
+ linkAttr.rel = "imageGallery";
+ linkAttr.class = "imageGallery";
}
// Read form values for div
@@ -240,7 +255,7 @@
// the folling has to be done for both cases
// insert link, if fancybox features are activated
- if(values.zoom || values.gallery)
+ if(values.fancybox.value != "none")
{
link = document.createElement("a");
for(var attr in linkAttr)
@@ -256,7 +271,7 @@
{
img.setAttribute(attr, imgAttr[attr]);
}
- if(values.zoom || values.gallery)
+ if(values.fancybox.value != "none")
{
link.appendChild(img);
}
@@ -358,11 +373,15 @@
{
if(dialog.getElementById(dialog.id["preview"]).style.display == "block")
{
+
+
// Recalculate height of preview
dialog.getElementById(dialog.id["preview"]).style.height = Math.min(Math.max(0, dialog.height - this._getCombinedComponentHeight() - 20), Math.round((window.innerHeight * 0.8) - this._getCombinedComponentHeight())) + "px";
// Resize preview image
this.resizePreview(dialog);
}
+ dialog.width = Math.min(Math.max(10, dialog.width), Math.round((window.innerWidth * 0.8)));
+ dialog.height = Math.min(Math.max(10, dialog.height), Math.round((window.innerHeight * 0.8)));
};
OpenCCM.prototype.resizePreview = function(dialog)
@@ -374,16 +393,21 @@
var maxHeight = previewElem.offsetHeight && previewElem.offsetHeight - 15 < Math.round((window.innerHeight * 0.8) - this._getCombinedComponentHeight())
? previewElem.offsetHeight - 15
: Math.round((window.innerHeight * 0.8) - this._getCombinedComponentHeight());
-
+
dialog.getElementById(dialog.id["ipreview"]).style.width = "auto";
dialog.getElementById(dialog.id["ipreview"]).style.height = "auto";
var width = parseInt(dialog.getElementById(dialog.id["ipreview"]).width,10);
var height = parseInt(dialog.getElementById(dialog.id["ipreview"]).height,10);
- var zoom = Math.min(maxWidth / width,
- maxHeight / height);
-
+// alert("W: " + maxWidth +" "+ width + "H: " + maxHeight +" "+ height);
+
+ var zoom = height > 0
+ ? Math.min(maxWidth / width, maxHeight / height)
+ : maxWidth / width;
+
+// alert("Zoom: " + zoom);
+
var w = dialog.getElementById(dialog.id["ipreview"]).style.width = Math.round(width * zoom) + "px";
var h = dialog.getElementById(dialog.id["ipreview"]).style.height = Math.round(height * zoom) + "px";
};
Modified: trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/de.js
===================================================================
--- trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/de.js 2012-12-18 22:51:03 UTC (rev 2426)
+++ trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/de.js 2012-12-18 23:13:16 UTC (rev 2427)
@@ -3,4 +3,19 @@
{
"OpenCCMInsertLink" : "Link einfügen / bearbeiten",
"OpenCCMInsertImage" : "Bild einfügen / bearbeiten",
+ "Name:" : "Name:",
+ "Alternate:" : "Alt-Text",
+ "Title:" : "Titel:",
+ "Layout" : "Darstellung",
+ "Alignment:" : "Ausrichtung:",
+ "Center" : "zentriert",
+ "Show Caption:" : "Zeige Bildunterschrift:",
+ "Fancybox" : "Fancybox:",
+ "Disabled" : "Deaktiviert",
+ "Zoom" : "Zoom",
+ "Gallery" : "Gallerie",
+ "Dimension" : "Dimensionen",
+ "Width:" : "Breite:",
+ "Height:" : "Höhe:",
+ "Preview" : "Vorschau"
}
Modified: trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/en.js
===================================================================
--- trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/en.js 2012-12-18 22:51:03 UTC (rev 2426)
+++ trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/lang/en.js 2012-12-18 23:13:16 UTC (rev 2427)
@@ -3,4 +3,19 @@
{
"OpenCCMInsertLink" : "Create / modify link",
"OpenCCMInsertImage" : "Insert / modify image",
+ "Name:" : "Name:",
+ "Alternate:" : "Alternate",
+ "Title:" : "Title:",
+ "Layout" : "Layout",
+ "Alignment:" : "Alignment:",
+ "Center" : "zentriert",
+ "Show Caption:" : "Show Caption:",
+ "Fancybox" : "Fancybox:",
+ "Disabled" : "Disabled",
+ "Zoom" : "Zoom",
+ "Gallery" : "Gallery",
+ "Dimension" : "Dimension",
+ "Width:" : "Width:",
+ "Height:" : "Height:",
+ "Preview" : "Preview"
}
|
|
From: <pb...@fe...> - 2012-12-18 22:51:12
|
Author: pboy
Date: 2012-12-18 22:51:03 +0000 (Tue, 18 Dec 2012)
New Revision: 2426
Added:
trunk/ccm-bundle/sql/ccm-bundle/
trunk/ccm-bundle/sql/ccm-bundle/upgrade/
trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/
trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/
trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
Removed:
trunk/ccm-bundle/sql/upgrade/
Modified:
trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
Log:
Fixed upgrade scripts (database sql), Enhancement navigation index page. (on behalf of JensP)
Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql 2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,92 @@
+--
+-- Copyright (C) 2011 Peter Boy 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
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: upd_nav_templates_table pboy $
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+-- Update new path
+update nav_templates
+ set url=replace(url,'packages/navigation/templates'
+ ,'templates/ccm-navigation/navigation')
+ where url like '%packages/navigation/templates%';
+
+
+-- AAP: update jsp names
+update nav_templates
+ set url=replace(url,'aap-atoz','sci-atoz'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-atoz%';
+
+update nav_templates
+ set url=replace(url,'aap-default' ,'sci-default'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-default%';
+
+update nav_templates
+ set url=replace(url,'aap-portal' ,'sci-portal'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-portal%';
+
+update nav_templates
+ set url=replace(url,'aap-recent' ,'sci-recent'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-recent%';
+
+update nav_templates
+ set url=replace(url,'aap-welcome' ,'sci-welcome'),
+ description=replace(description,'AAP','SCI'),
+ title=replace(title,'AAP','SCI')
+ where url like '%aap-welcome%';
+
+
+-- IAW: update jsp names
+update nav_templates
+ set url=replace(url,'iaw-atoz','sci-atoz'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-atoz%';
+
+update nav_templates
+ set url=replace(url,'iaw-default' ,'sci-default'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-default%';
+
+update nav_templates
+ set url=replace(url,'iaw-portal' ,'sci-portal'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-portal%';
+
+update nav_templates
+ set url=replace(url,'iaw-recent' ,'sci-recent'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-recent%';
+
+update nav_templates
+ set url=replace(url,'iaw-welcome' ,'sci-welcome'),
+ description=replace(description,'IAW','SCI'),
+ title=replace(title,'IAW','SCI')
+ where url like '%iaw-welcome%';
Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql 2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,68 @@
+--
+-- Copyright (C) 2011 Peter Boy 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: upd_system_tables.sql pboy $
+
+-- adjust various system tables to the new name of application (ccm-sci-bundle)
+
+alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
+
+alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
+
+update inits
+ set class_name=replace(class_name,'arsdigita.aplaws', 'arsdigita.bundle')
+ where class_name like '%arsdigita.aplaws%' ;
+
+update init_requirements
+ set init=replace(init,'arsdigita.aplaws', 'arsdigita.bundle')
+ where init like '%arsdigita.aplaws%' ;
+
+update init_requirements
+ set required_init=replace(required_init,'arsdigita.aplaws', 'arsdigita.bundle')
+ where required_init like '%arsdigita.aplaws%' ;
+
+ALTER TABLE ONLY init_requirements
+ ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
+ REFERENCES inits (class_name) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+ALTER TABLE init_requirements
+ ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+ REFERENCES inits (class_name) MATCH SIMPLE
+ ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+
+-- update application_types
+-- set object_type=replace(object_type,'london.portal', 'portalworkspace')
+-- where object_type like '%london.portal%' ;
+
+-- table applications doesn't require an update
+
+-- update apm_package_types
+-- set package_key=replace(package_key,'workspace', 'portalworkspace')
+-- where package_key like 'workspace' ;
+
+-- table apm_packages doesn't require an update either
+-- table site_nodes doesn't require an update either
+
+
+-- update application type in acs_objects
+update acs_objects
+ set (object_type,default_domain_class) =
+ (replace(object_type,'arsdigita.aplaws', 'arsdigita.bundle') ,
+ replace(default_domain_class,'arsdigita.aplaws', 'arsdigita.bundle') )
+ where object_type like '%arsdigita.aplaws%' ;
Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql 2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2011 Peter Boy 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
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: oracle-se-0.0.0-6.6.0 pboy $
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+@@ default/0.0.0-6.6.0/upd_system_tables.sql
+@@ default/0.0.0-6.6.0/upd_nav_templates_table.sql
+
Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql 2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,31 @@
+--
+-- Copyright (C) 2011 Peter Boy 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
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: postgres-0.0.0-6.6.0 pboy $
+
+\echo Red Hat Enterprise ccm-sci-bundle 0.0.0 -> 6.6.0 Upgrade Script (PostgreSQL)
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+begin;
+
+\i default/0.0.0-6.6.0/upd_system_tables.sql
+\i default/0.0.0-6.6.0/upd_nav_templates_table.sql
+
+commit;
Modified: trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
===================================================================
--- trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql 2012-12-18 22:42:22 UTC (rev 2425)
+++ trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql 2012-12-18 22:51:03 UTC (rev 2426)
@@ -21,7 +21,7 @@
begin;
-\i ../default/upgrade/6.6.0-6.6.1/drop_constraints_ct_addresses.sql
+\i ../default/upgrade/6.6.0-6.6.1/drop_constraints_ct_adresses.sql
\i ../default/upgrade/6.6.0-6.6.1/upd_table_iso_countries.sql
\i ../default/upgrade/6.6.0-6.6.1/upd_table_ct_addresses.sql
\i ../default/upgrade/6.6.0-6.6.1/upd_system_tables.sql
Modified: trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
===================================================================
--- trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java 2012-12-18 22:42:22 UTC (rev 2425)
+++ trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java 2012-12-18 22:51:03 UTC (rev 2426)
@@ -59,8 +59,7 @@
private static final Logger s_log = Logger.getLogger(GreetingItem.class);
public Element generateXML(HttpServletRequest request,
- HttpServletResponse response) {
- long start = System.currentTimeMillis();
+ HttpServletResponse response) {
ContentItem item = (ContentItem) getObject();
if (null == item || !item.isLive()) {
return null;
@@ -70,7 +69,6 @@
item = item.getLiveVersion();
}
-
Element content = Navigation.newElement("greetingItem");
Party currentParty = Kernel.getContext().getParty();
if (currentParty == null) {
Modified: trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
===================================================================
--- trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java 2012-12-18 22:42:22 UTC (rev 2425)
+++ trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java 2012-12-18 22:51:03 UTC (rev 2426)
@@ -269,7 +269,7 @@
//- They have to be registered very early, so we can't add new parameters
// from a JSP.
//- The HttpRequest is available here.
- //So we use the HTTP request directly, which allows use to use a
+ //So we use the HTTP request directly, which allows us to use a
//dedicated parameter for each of the filters.
/*
* if (request.getCharacterEncoding() == null) {
|
Author: pboy
Date: 2012-12-18 22:42:22 +0000 (Tue, 18 Dec 2012)
New Revision: 2425
Added:
trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/CategoryPortalSelectionModel.java
Removed:
trunk/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/CategoryPortalSelectionModel.java
Modified:
trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
trunk/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java
trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java
Log:
Fixed various path entries.
Modified: trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp
===================================================================
--- trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp 2012-12-18 22:40:23 UTC (rev 2424)
+++ trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal-welcome.jsp 2012-12-18 22:42:22 UTC (rev 2425)
@@ -4,12 +4,12 @@
xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2">
- <%-- JSP template to use a portal page as index page in navigation --%>
+ <!-- JSP template to use a portal page as index page in navigation -->
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
- <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
+ <jsp:directive.page import="com.arsdigita.portalworkspace.ui.CategoryPortalSelectionModel"/>
<jsp:scriptlet>
long age = Navigation.getConfig().getIndexPageCacheLifetime();
Modified: trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp
===================================================================
--- trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp 2012-12-18 22:40:23 UTC (rev 2424)
+++ trunk/ccm-bundle/web/templates/ccm-navigation/navigation/gen-portal.jsp 2012-12-18 22:42:22 UTC (rev 2425)
@@ -9,7 +9,7 @@
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
- <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
+ <jsp:directive.page import="com.arsdigita.portalworkspace.ui.CategoryPortalSelectionModel"/>
<jsp:scriptlet>
long age = Navigation.getConfig().getIndexPageCacheLifetime();
Modified: trunk/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java
===================================================================
--- trunk/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java 2012-12-18 22:40:23 UTC (rev 2424)
+++ trunk/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java 2012-12-18 22:42:22 UTC (rev 2425)
@@ -66,6 +66,7 @@
*/
public ArticlePropertyForm(ItemSelectionModel itemModel, ArticlePropertiesStep step) {
super(itemModel, step);
+ m_step = step;
addSubmissionListener(this);
}
@@ -131,7 +132,7 @@
article.setLead((String) data.get(LEAD));
article.save();
- }
+ }
if (m_step != null) {
m_step.maybeForwardToNextStep(fse.getPageState());
}
Modified: trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
===================================================================
--- trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp 2012-12-18 22:40:23 UTC (rev 2424)
+++ trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp 2012-12-18 22:42:22 UTC (rev 2425)
@@ -7,7 +7,7 @@
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
- <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
+ <jsp:directive.page import="com.arsdigita.portalworkspace.ui.CategoryPortalSelectionModel"/>
<jsp:scriptlet>
long age = Navigation.getConfig().getIndexPageCacheLifetime();
Modified: trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
===================================================================
--- trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java 2012-12-18 22:40:23 UTC (rev 2424)
+++ trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java 2012-12-18 22:42:22 UTC (rev 2425)
@@ -575,7 +575,7 @@
// .retrieve("com.arsdigita.kernel.Party");
Filter f = dc.addNotInSubqueryFilter(
"id",
- "com.arsdigita.london.portal.WorkspaceParticipantIDs");
+ "com.arsdigita.portalworkspace.WorkspaceParticipantIDs");
f.set("workspaceID", getID());
return new PartyCollection(dc);
}
@@ -594,7 +594,7 @@
**/
public Iterator getParticipantInitials() {
DataQuery query = SessionManager.getSession().retrieveQuery(
- "com.arsdigita.london.portal.WorkspaceParticipantInitials");
+ "com.arsdigita.portalworkspace.WorkspaceParticipantInitials");
query.setParameter("workspaceID", getID());
LinkedList result = new LinkedList();
@@ -750,7 +750,7 @@
public WorkspaceCollection getChildWorkspaces() {
DataQuery query = SessionManager.getSession().retrieveQuery(
- "com.arsdigita.london.portal.childWorkspacesForApplicationID");
+ "com.arsdigita.portalworkspace.childWorkspacesForApplicationID");
query.setParameter("applicationID", getID());
DataCollection collection =
Added: trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/CategoryPortalSelectionModel.java
===================================================================
--- trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/CategoryPortalSelectionModel.java (rev 0)
+++ trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/CategoryPortalSelectionModel.java 2012-12-18 22:42:22 UTC (rev 2425)
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2001-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
+ */
+
+package com.arsdigita.portalworkspace.ui;
+
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.categorization.Category;
+import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.util.Assert;
+
+/**
+ * (Short description)
+ *
+ * Purpose: Service class to use in a Navigation jsp index page to enable
+ * the inclusion of a portal workspace as a leaf page into a navigation tree.
+ *
+ */
+public class CategoryPortalSelectionModel extends WorkspaceSelectionModel {
+
+ /**
+ *
+ * @param state
+ * @return
+ */
+ protected Workspace getDefaultWorkspace(PageState state) {
+ NavigationModel model = Navigation.getConfig().getDefaultModel();
+ Category cat = model.getCategory();
+ Assert.exists(cat);
+
+ DataCollection workspaces
+ = SessionManager.getSession().retrieve(
+ Workspace.BASE_DATA_OBJECT_TYPE);
+ workspaces.addEqualsFilter("categories.id", cat.getID());
+
+ if (workspaces.next()) {
+ Workspace wk = (Workspace)DomainObjectFactory
+ .newInstance(workspaces.getDataObject());
+ workspaces.close();
+ return wk;
+ }
+
+ return null;
+ }
+}
Modified: trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java
===================================================================
--- trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java 2012-12-18 22:40:23 UTC (rev 2424)
+++ trunk/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java 2012-12-18 22:42:22 UTC (rev 2425)
@@ -15,7 +15,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.arsdigita.portalworkspace.ui.admin;
import java.util.HashMap;
@@ -42,15 +41,10 @@
public class ApplicationPane extends SimpleContainer {
private Map m_edit; // Map of application type -> edit config form
-
private Map m_create;
-
private NewApplicationForm m_newApp;
-
private ApplicationDetails m_appDetails;
-
private ActionLink m_editLink;
-
private ApplicationSelectionModel m_app;
/**
@@ -58,144 +52,156 @@
* @param app
*/
public ApplicationPane(ApplicationSelectionModel app) {
- super("portal:applicationPane", PortalConstants.PORTAL_XML_NS);
+ super("portal:applicationPane", PortalConstants.PORTAL_XML_NS);
- m_app = app;
+ m_app = app;
- m_create = new HashMap();
- m_edit = new HashMap();
+ m_create = new HashMap();
+ m_edit = new HashMap();
- m_appDetails = new ApplicationDetails(app);
- add(m_appDetails);
+ m_appDetails = new ApplicationDetails(app);
+ add(m_appDetails);
- m_editLink = new ActionLink("edit");
- m_editLink.addActionListener(new ApplicationEditListener());
- add(m_editLink);
+ m_editLink = new ActionLink("edit");
+ m_editLink.addActionListener(new ApplicationEditListener());
+ add(m_editLink);
- m_newApp = new NewApplicationForm();
- m_newApp.addCompletionListener(new ApplicationCreateListener());
- add(m_newApp);
+ m_newApp = new NewApplicationForm();
+ m_newApp.addCompletionListener(new ApplicationCreateListener());
+ add(m_newApp);
- final RequestLocal appRL = new RequestLocal() {
- public Object initialValue(PageState state) {
- return m_app.getSelectedObject(state);
- }
- };
+ final RequestLocal appRL = new RequestLocal() {
+ public Object initialValue(PageState state) {
+ return m_app.getSelectedObject(state);
+ }
- ApplicationTypeCollection types = ApplicationType
- .retrieveAllApplicationTypes();
- while (types.next()) {
- ApplicationType type = types.getApplicationType();
+ };
- ResourceConfigComponent create = type.getCreateComponent(appRL);
- create.addCompletionListener(new ApplicationCompleteCreateListener(
- create));
- m_create.put(type.getOID(), create);
- add(create);
+ ApplicationTypeCollection types = ApplicationType
+ .retrieveAllApplicationTypes();
+ while (types.next()) {
+ ApplicationType type = types.getApplicationType();
- ResourceConfigComponent modify = type.getModifyComponent(appRL);
- modify.addCompletionListener(new ApplicationCompleteEditListener(
- modify));
- m_edit.put(type.getOID(), modify);
- add(modify);
- }
+ ResourceConfigComponent create = type.getCreateComponent(appRL);
+ create.addCompletionListener(new ApplicationCompleteCreateListener(
+ create));
+ m_create.put(type.getOID(), create);
+ add(create);
- }
+ ResourceConfigComponent modify = type.getModifyComponent(appRL);
+ modify.addCompletionListener(new ApplicationCompleteEditListener(
+ modify));
+ m_edit.put(type.getOID(), modify);
+ add(modify);
+ }
- public void register(Page p) {
- super.register(p);
+ }
- Iterator c = m_create.keySet().iterator();
- while (c.hasNext()) {
- OID type = (OID) c.next();
- p.setVisibleDefault((Component) m_create.get(type), false);
- }
+ public void register(Page p) {
+ super.register(p);
- Iterator e = m_edit.keySet().iterator();
- while (e.hasNext()) {
- OID type = (OID) e.next();
- p.setVisibleDefault((Component) m_edit.get(type), false);
- }
- }
+ Iterator c = m_create.keySet().iterator();
+ while (c.hasNext()) {
+ OID type = (OID) c.next();
+ p.setVisibleDefault((Component) m_create.get(type), false);
+ }
- private class ApplicationCreateListener implements ActionListener {
- public void actionPerformed(ActionEvent e) {
- PageState state = e.getPageState();
+ Iterator e = m_edit.keySet().iterator();
+ while (e.hasNext()) {
+ OID type = (OID) e.next();
+ p.setVisibleDefault((Component) m_edit.get(type), false);
+ }
+ }
- ApplicationType type = m_newApp.getApplicationType(state);
+ private class ApplicationCreateListener implements ActionListener {
- Component editor = (Component) m_create.get(type.getOID());
- editor.setVisible(state, true);
+ public void actionPerformed(ActionEvent e) {
+ PageState state = e.getPageState();
- m_newApp.setVisible(state, false);
- m_appDetails.setVisible(state, false);
- m_editLink.setVisible(state, false);
- }
- }
+ ApplicationType type = m_newApp.getApplicationType(state);
- private class ApplicationEditListener implements ActionListener {
- public void actionPerformed(ActionEvent e) {
- PageState state = e.getPageState();
+ Component editor = (Component) m_create.get(type.getOID());
+ editor.setVisible(state, true);
- Application app = (Application) m_app.getSelectedObject(state);
+ m_newApp.setVisible(state, false);
+ m_appDetails.setVisible(state, false);
+ m_editLink.setVisible(state, false);
+ }
- Component editor = (Component) m_edit.get(app.getResourceType()
- .getOID());
- editor.setVisible(state, true);
+ }
- m_newApp.setVisible(state, false);
- m_appDetails.setVisible(state, false);
- m_editLink.setVisible(state, false);
- }
- }
+ private class ApplicationEditListener implements ActionListener {
- private class ApplicationCompleteCreateListener implements ActionListener {
- private Component m_src;
+ public void actionPerformed(ActionEvent e) {
+ PageState state = e.getPageState();
- public ApplicationCompleteCreateListener(Component src) {
- m_src = src;
- }
+ Application app = (Application) m_app.getSelectedObject(state);
- public void actionPerformed(ActionEvent e) {
- PageState state = e.getPageState();
+ Component editor = (Component) m_edit.get(app.getResourceType()
+ .getOID());
+ editor.setVisible(state, true);
- ResourceConfigComponent c = (ResourceConfigComponent) m_src;
- Resource newResource = c.createResource(state);
- c.setVisible(state, false);
+ m_newApp.setVisible(state, false);
+ m_appDetails.setVisible(state, false);
+ m_editLink.setVisible(state, false);
+ }
- // Copy categorization from nav app instance
- Resource parentResource = newResource.getParentResource();
- Category.setRootForObject(newResource, Category
- .getRootForObject(parentResource));
+ }
- m_newApp.setVisible(state, true);
- m_appDetails.setVisible(state, true);
- m_editLink.setVisible(state, true);
+ private class ApplicationCompleteCreateListener implements ActionListener {
- m_app.clearSelection(state);
- }
- }
+ private Component m_src;
- private class ApplicationCompleteEditListener implements ActionListener {
- private Component m_src;
+ public ApplicationCompleteCreateListener(Component src) {
+ m_src = src;
+ }
- public ApplicationCompleteEditListener(Component src) {
- m_src = src;
- }
+ public void actionPerformed(ActionEvent e) {
+ PageState state = e.getPageState();
- public void actionPerformed(ActionEvent e) {
- PageState state = e.getPageState();
+ ResourceConfigComponent c = (ResourceConfigComponent) m_src;
+ Resource newResource = c.createResource(state);
+ if (newResource != null) {
- ResourceConfigComponent c = (ResourceConfigComponent) m_src;
- c.modifyResource(state);
- c.setVisible(state, false);
- m_newApp.setVisible(state, true);
- m_appDetails.setVisible(state, true);
- m_editLink.setVisible(state, true);
+ c.setVisible(state, false);
- m_app.clearSelection(state);
- }
- }
+ // Copy categorization from nav app instance
+ Resource parentResource = newResource.getParentResource();
+ Category.setRootForObject(newResource, Category
+ .getRootForObject(parentResource));
+ }
+ m_newApp.setVisible(state, true);
+ m_appDetails.setVisible(state, true);
+ m_editLink.setVisible(state, true);
+
+ m_app.clearSelection(state);
+ }
+
+ }
+
+ private class ApplicationCompleteEditListener implements ActionListener {
+
+ private Component m_src;
+
+ public ApplicationCompleteEditListener(Component src) {
+ m_src = src;
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ PageState state = e.getPageState();
+
+ ResourceConfigComponent c = (ResourceConfigComponent) m_src;
+ c.modifyResource(state);
+ c.setVisible(state, false);
+
+ m_newApp.setVisible(state, true);
+ m_appDetails.setVisible(state, true);
+ m_editLink.setVisible(state, true);
+
+ m_app.clearSelection(state);
+ }
+
+ }
}
Deleted: trunk/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/CategoryPortalSelectionModel.java
===================================================================
--- trunk/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/CategoryPortalSelectionModel.java 2012-12-18 22:40:23 UTC (rev 2424)
+++ trunk/ccm-portalworkspace-homepage/src/com/arsdigita/portalworkspace/ui/homepage/CategoryPortalSelectionModel.java 2012-12-18 22:42:22 UTC (rev 2425)
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2001-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
- */
-
-package com.arsdigita.portalworkspace.ui.homepage;
-
-import com.arsdigita.navigation.Navigation;
-import com.arsdigita.navigation.NavigationModel;
-
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.persistence.DataCollection;
-
-import com.arsdigita.domain.DomainObjectFactory;
-
-import com.arsdigita.categorization.Category;
-import com.arsdigita.util.Assert;
-import com.arsdigita.bebop.PageState;
-
-import com.arsdigita.portalworkspace.Workspace;
-import com.arsdigita.portalworkspace.ui.WorkspaceSelectionModel;
-
-/**
- *
- *
- */
-public class CategoryPortalSelectionModel extends WorkspaceSelectionModel {
-
- /**
- *
- * @param state
- * @return
- */
- protected Workspace getDefaultWorkspace(PageState state) {
- NavigationModel model = Navigation.getConfig().getDefaultModel();
- Category cat = model.getCategory();
- Assert.exists(cat);
-
- DataCollection workspaces
- = SessionManager.getSession().retrieve(
- Workspace.BASE_DATA_OBJECT_TYPE);
- workspaces.addEqualsFilter("categories.id", cat.getID());
-
- if (workspaces.next()) {
- Workspace wk = (Workspace)DomainObjectFactory
- .newInstance(workspaces.getDataObject());
- workspaces.close();
- return wk;
- }
-
- return null;
- }
-}
|
|
From: <pb...@fe...> - 2012-12-18 22:40:32
|
Author: pboy
Date: 2012-12-18 22:40:23 +0000 (Tue, 18 Dec 2012)
New Revision: 2424
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java
Log:
Fixed upgrade scripts. (on behalf of JensP)
Modified: trunk/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java 2012-12-18 22:28:18 UTC (rev 2423)
+++ trunk/ccm-cms/src/com/arsdigita/cms/upgrade/AddNewStyleApplicationEntries.java 2012-12-18 22:40:23 UTC (rev 2424)
@@ -93,7 +93,7 @@
ApplicationType appType = null;
appType = Loader.loadWorkspaceApplicationType();
// get corresponding package type
- PackageType packageType = appType.getPackageType();
+ PackageType packageType = PackageType.findByKey("content-center");
// get all installed instances
PackageInstanceCollection allPackages = packageType
.getInstances();
@@ -119,7 +119,7 @@
appType = null;
appType = Loader.loadServiceApplicationType();
// get corresponding package type
- packageType = appType.getPackageType();
+ packageType = PackageType.findByKey("cms-service");
// get all installed instances
allPackages = packageType.getInstances();
aPackage = null ;
|
|
From: <pb...@fe...> - 2012-12-18 22:28:30
|
Author: pboy
Date: 2012-12-18 22:28:18 +0000 (Tue, 18 Dec 2012)
New Revision: 2423
Modified:
releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java
Log:
Fixed Cancel dialogue to add roles, fixed wizard in article (on behalf of JensP)
Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java 2012-12-18 21:43:41 UTC (rev 2422)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java 2012-12-18 22:28:18 UTC (rev 2423)
@@ -53,8 +53,8 @@
import java.util.TooManyListenersException;
class TaskAddRole extends CMSForm {
+
private final TaskRequestLocal m_task;
-
private final OptionGroup m_roles;
private final Submit m_add;
private final Submit m_cancel;
@@ -90,6 +90,7 @@
}
private class InitListener implements FormInitListener {
+
public final void init(final FormSectionEvent e)
throws FormProcessException {
final PageState state = e.getPageState();
@@ -104,29 +105,35 @@
m_roles.setValue(state, list.toArray());
}
+
}
private class ProcessListener implements FormProcessListener {
+
public final void process(final FormSectionEvent e)
throws FormProcessException {
final PageState state = e.getPageState();
- final CMSTask task = m_task.getTask(state);
+ if (m_add.isSelected(state)) {
+ final CMSTask task = m_task.getTask(state);
- task.removeAllGroupAssignees();
+ task.removeAllGroupAssignees();
- final String[] roles = (String[]) m_roles.getValue(state);
+ final String[] roles = (String[]) m_roles.getValue(state);
- if (roles != null) {
- for (int i = 0; i < roles.length; i++) {
- task.assignGroup(new Group(new BigDecimal(roles[i])));
+ if (roles != null) {
+ for (int i = 0; i < roles.length; i++) {
+ task.assignGroup(new Group(new BigDecimal(roles[i])));
+ }
}
+
+ task.save();
}
+ }
- task.save();
- }
}
private class SubmissionListener implements FormSubmissionListener {
+
public final void submitted(final FormSectionEvent e)
throws FormProcessException {
final PageState state = e.getPageState();
@@ -134,15 +141,16 @@
if (!sm.canAccess(state.getRequest(),
SecurityManager.WORKFLOW_ADMIN)) {
- throw new FormProcessException
- (lz(("cms.ui.workflow.insufficient_privileges")));
+ throw new FormProcessException(lz(("cms.ui.workflow.insufficient_privileges")));
}
}
+
}
private class RoleOptionPrintListener extends DataQueryOptionPrintListener {
+
public static final String QUERY_NAME =
- "com.arsdigita.cms.getStaffRoles";
+ "com.arsdigita.cms.getStaffRoles";
public RoleOptionPrintListener() {
super();
@@ -163,8 +171,9 @@
}
public String getValue(DataQuery d) {
- return (String)d.get("name");
+ return (String) d.get("name");
}
+
}
private static GlobalizedMessage gz(final String key) {
@@ -174,4 +183,5 @@
private static String lz(final String key) {
return (String) gz(key).localize();
}
+
}
Modified: releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java
===================================================================
--- releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java 2012-12-18 21:43:41 UTC (rev 2422)
+++ releases/2.0.0/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertyForm.java 2012-12-18 22:28:18 UTC (rev 2423)
@@ -66,6 +66,7 @@
*/
public ArticlePropertyForm(ItemSelectionModel itemModel, ArticlePropertiesStep step) {
super(itemModel, step);
+ m_step = step;
addSubmissionListener(this);
}
|
Author: pboy
Date: 2012-12-18 21:43:41 +0000 (Tue, 18 Dec 2012)
New Revision: 2422
Modified:
releases/2.0.0/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources_de.properties
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
releases/2.0.0/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java
Log:
Backport r2419 (Improved ItemSearchCreatePane, ensures folder is selected, fixed item publishing in ISW, fixed typos (on behalf of JensP)
Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources.properties 2012-12-18 21:35:11 UTC (rev 2421)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources.properties 2012-12-18 21:43:41 UTC (rev 2422)
@@ -1,17 +1,17 @@
# Package com.arsdigita.cms
# =========================
-cms.attributeset_is_already_locked=AttributeSet is already locked
-cms.attributeset_is_locked=AttributeSet is locked
-cms.cannot_create_xml_document=Cannot create XML document
-cms.cant_promote_folders=Can't promote folders
-cms.classnotfoundexception=ClassNotFoundException:
-cms.illegalaccessexception=IllegalAccessException:
-cms.image.erroneous_jpeg_marker_length=Erroneous JPEG marker length
-cms.image.expected_soi_marker_first=Expected SOI marker first
+cms.attributeset_is_already_locked=AttributeSet is already locked
+cms.attributeset_is_locked=AttributeSet is locked
+cms.cannot_create_xml_document=Cannot create XML document
+cms.cant_promote_folders=Can't promote folders
+cms.classnotfoundexception=ClassNotFoundException:
+cms.illegalaccessexception=IllegalAccessException:
+cms.image.erroneous_jpeg_marker_length=Erroneous JPEG marker length
+cms.image.expected_soi_marker_first=Expected SOI marker first
cms.image.not_a_jpeg_file=Not a JPEG file
-cms.instantiationexception=Instantiation Exception:
-cms.nosuchmethodexception=No-Such-Method Exception:
-cms.templates=Templates
+cms.instantiationexception=Instantiation Exception:
+cms.nosuchmethodexception=No-Such-Method Exception:
+cms.templates=Templates
cms.title=Title
no=No
yes=Yes
@@ -22,49 +22,49 @@
# Package com.arsdigita.cms.contenttypes
# ======================================
-cms.contenttypes.contact=Contact:
-cms.contenttypes.contact_details=Contact Details:
-cms.contenttypes.contact_information=Contact Information:
-cms.contenttypes.contactinfo=ContactInfo:
-cms.contenttypes.cost=Cost:
-cms.contenttypes.coudlnt_retrieve_text=Coudln't retrieve text
+cms.contenttypes.contact=Contact:
+cms.contenttypes.contact_details=Contact Details:
+cms.contenttypes.contact_information=Contact Information:
+cms.contenttypes.contactinfo=ContactInfo:
+cms.contenttypes.cost=Cost:
+cms.contenttypes.coudlnt_retrieve_text=Coudln't retrieve text
cms.contenttypes.current_image=Current Image:
-cms.contenttypes.department=Department:
-cms.contenttypes.end_date=End Date:
+cms.contenttypes.department=Department:
+cms.contenttypes.end_date=End Date:
cms.contenttypes.end_time=End Time:
-cms.contenttypes.event_type_not_registered=Event type not registered
+cms.contenttypes.event_type_not_registered=Event type not registered
#used in ccm-cms-types-job
-cms.contenttypes.grade=Grade:
+cms.contenttypes.grade=Grade:
#used in ccm-cms-types-organization
cms.contenttypes.image=Image:
-cms.contenttypes.installer.article_section=Article Section
-cms.contenttypes.installer.article_section_for_a_multipart_article=Article section for a multi-part article
-cms.contenttypes.job_description=Description:
-cms.contenttypes.job_type_not_registered=Job type not registered
-cms.contenttypes.lead=Description:
-cms.contenttypes.legalnotice_type_not_registered=LegalNotice type not registered
+cms.contenttypes.installer.article_section=Article Section
+cms.contenttypes.installer.article_section_for_a_multipart_article=Article section for a multi-part article
+cms.contenttypes.job_description=Description:
+cms.contenttypes.job_type_not_registered=Job type not registered
+cms.contenttypes.lead=Description:
+cms.contenttypes.legalnotice_type_not_registered=LegalNotice type not registered
cms.contenttypes.link=Link:
-cms.contenttypes.link_to_map=Link to Map:
-cms.contenttypes.location=Location:
-cms.contenttypes.main_contributor=Main Contributor:
-cms.contenttypes.minutes_type_not_registered=Minutes type not registered
-cms.contenttypes.news_date=Date:
-cms.contenttypes.newsitem_type_not_registered=NewsItem type not registered
-cms.contenttypes.no_content_section=No content section
-cms.contenttypes.no_section=No section
-cms.contenttypes.opening_time=Opening Time:
-cms.contenttypes.person_specification=Person Specification:
-cms.contenttypes.pressrelease_type_not_registered=PressRelease type not registered
-cms.contenttypes.ref_number=Ref. Number:
-cms.contenttypes.salary=Salary:
-cms.contenttypes.service_type_not_registered=Service type not registered
-cms.contenttypes.services_provided=Services Provided:
-cms.contenttypes.start_date=Start Date:
-cms.contenttypes.start_time=Start Time:
-cms.contenttypes.subjectitems=SubjectItems:
-cms.contenttypes.summary=Description:
-cms.contenttypes.title=Title:
+cms.contenttypes.link_to_map=Link to Map:
+cms.contenttypes.location=Location:
+cms.contenttypes.main_contributor=Main Contributor:
+cms.contenttypes.minutes_type_not_registered=Minutes type not registered
+cms.contenttypes.news_date=Date:
+cms.contenttypes.newsitem_type_not_registered=NewsItem type not registered
+cms.contenttypes.no_content_section=No content section
+cms.contenttypes.no_section=No section
+cms.contenttypes.opening_time=Opening Time:
+cms.contenttypes.person_specification=Person Specification:
+cms.contenttypes.pressrelease_type_not_registered=PressRelease type not registered
+cms.contenttypes.ref_number=Ref. Number:
+cms.contenttypes.salary=Salary:
+cms.contenttypes.service_type_not_registered=Service type not registered
+cms.contenttypes.services_provided=Services Provided:
+cms.contenttypes.start_date=Start Date:
+cms.contenttypes.start_time=Start Time:
+cms.contenttypes.subjectitems=SubjectItems:
+cms.contenttypes.summary=Description:
+cms.contenttypes.title=Title:
cms.contenttypes.template.body_text.title=Body text
cms.contenttypes.template.body_text.description=Edit the body text
cms.contenttypes.shared.assign_categories.title=Assign Categories
@@ -79,127 +79,127 @@
# Package com.arsdigita.cms.contenttypes.ui
# =========================================
-cms.contenttypes.ui.action_item=Action Item:
-cms.contenttypes.ui.address=Address:
-cms.contenttypes.ui.agenda_date=Agenda Date:
-cms.contenttypes.ui.agenda_date_and_time=Agenda Date and Time:
-cms.contenttypes.ui.attendees=Attendees:
-cms.contenttypes.ui.bodyoverview=Body/Overview:
-cms.contenttypes.ui.closing_date=Closing Date:
-cms.contenttypes.ui.contact_details=Contact Details:
-cms.contenttypes.ui.contact_info=Contact Info:
-cms.contenttypes.ui.contacts=Contacts:
-cms.contenttypes.ui.content_group_current_items=Current Items:
-cms.contenttypes.ui.content_group_name=Content Group Name:
-cms.contenttypes.ui.content_group_new_item=Add new item:
-cms.contenttypes.ui.cost=Cost:
-cms.contenttypes.ui.creation_date=Creation Date:
-cms.contenttypes.ui.date=Date:
-cms.contenttypes.ui.department=Department:
-cms.contenttypes.ui.description=Description:
+cms.contenttypes.ui.action_item=Action Item:
+cms.contenttypes.ui.address=Address:
+cms.contenttypes.ui.agenda_date=Agenda Date:
+cms.contenttypes.ui.agenda_date_and_time=Agenda Date and Time:
+cms.contenttypes.ui.attendees=Attendees:
+cms.contenttypes.ui.bodyoverview=Body/Overview:
+cms.contenttypes.ui.closing_date=Closing Date:
+cms.contenttypes.ui.contact_details=Contact Details:
+cms.contenttypes.ui.contact_info=Contact Info:
+cms.contenttypes.ui.contacts=Contacts:
+cms.contenttypes.ui.content_group_current_items=Current Items:
+cms.contenttypes.ui.content_group_name=Content Group Name:
+cms.contenttypes.ui.content_group_new_item=Add new item:
+cms.contenttypes.ui.cost=Cost:
+cms.contenttypes.ui.creation_date=Creation Date:
+cms.contenttypes.ui.date=Date:
+cms.contenttypes.ui.department=Department:
+cms.contenttypes.ui.description=Description:
cms.contenttypes.ui.description_missing=Please enter a description
-cms.contenttypes.ui.description_of_minutes=Description of Minutes:
-cms.contenttypes.ui.end_date=End Date:
-cms.contenttypes.ui.end_time=End Time:
+cms.contenttypes.ui.description_of_minutes=Description of Minutes:
+cms.contenttypes.ui.end_date=End Date:
+cms.contenttypes.ui.end_time=End Time:
cms.contenttypes.ui.event_start_time=Event Start Time:
cms.contenttypes.ui.event_end_time=Event End Time:
-cms.contenttypes.ui.government_uid=Government UID:
-cms.contenttypes.ui.grade=Grade:
+cms.contenttypes.ui.government_uid=Government UID:
+cms.contenttypes.ui.grade=Grade:
cms.contenttypes.ui.homepage=Homepage:
-cms.contenttypes.ui.job_description=Job Description:
-cms.contenttypes.ui.launch_date=Launch Date:
-cms.contenttypes.ui.lead=Description:
-cms.contenttypes.ui.lead_line=Description:
-cms.contenttypes.ui.link_to_map=Link to Map:
-cms.contenttypes.ui.location=Location:
-cms.contenttypes.ui.main_contributor=Main Contributor:
-cms.contenttypes.ui.name=Name:
-cms.contenttypes.ui.opening_times=Opening Times:
-cms.contenttypes.ui.person_specification=Person Specification:
-cms.contenttypes.ui.ref_code=Ref. Code:
-cms.contenttypes.ui.ref_number=Ref Number:
-cms.contenttypes.ui.reference=Reference:
-cms.contenttypes.ui.reference_code=Reference Code:
-cms.contenttypes.ui.salary=Salary:
-cms.contenttypes.ui.services_provided=Services Provided:
-cms.contenttypes.ui.start_date=Start Date:
-cms.contenttypes.ui.start_time=Start Time:
-cms.contenttypes.ui.subject_items=Subject Items:
-cms.contenttypes.ui.summary=Description:
-cms.contenttypes.ui.there_are_no_events=There are no events
-cms.contenttypes.ui.title=Title:
+cms.contenttypes.ui.job_description=Job Description:
+cms.contenttypes.ui.launch_date=Launch Date:
+cms.contenttypes.ui.lead=Description:
+cms.contenttypes.ui.lead_line=Description:
+cms.contenttypes.ui.link_to_map=Link to Map:
+cms.contenttypes.ui.location=Location:
+cms.contenttypes.ui.main_contributor=Main Contributor:
+cms.contenttypes.ui.name=Name:
+cms.contenttypes.ui.opening_times=Opening Times:
+cms.contenttypes.ui.person_specification=Person Specification:
+cms.contenttypes.ui.ref_code=Ref. Code:
+cms.contenttypes.ui.ref_number=Ref Number:
+cms.contenttypes.ui.reference=Reference:
+cms.contenttypes.ui.reference_code=Reference Code:
+cms.contenttypes.ui.salary=Salary:
+cms.contenttypes.ui.services_provided=Services Provided:
+cms.contenttypes.ui.start_date=Start Date:
+cms.contenttypes.ui.start_time=Start Time:
+cms.contenttypes.ui.subject_items=Subject Items:
+cms.contenttypes.ui.summary=Description:
+cms.contenttypes.ui.there_are_no_events=There are no events
+cms.contenttypes.ui.title=Title:
cms.contenttypes.ui.view_image=view image
-
-
+
+
# Package com.arsdigita.cms.dispatcher
# =====================================
-cms.dispatcher.cannot_find_domain_object=cannot find domain object
-cms.dispatcher.could_not_find_imageasset=Could not find ImageAsset:
-cms.dispatcher.failed_to_retrieve_imageasset=Failed to retrieve ImageAsset:
-cms.dispatcher.no_permission_to_access_resource=no permission to access resource
-cms.dispatcher.not_implemented=not implemented
+cms.dispatcher.cannot_find_domain_object=cannot find domain object
+cms.dispatcher.could_not_find_imageasset=Could not find ImageAsset:
+cms.dispatcher.failed_to_retrieve_imageasset=Failed to retrieve ImageAsset:
+cms.dispatcher.no_permission_to_access_resource=no permission to access resource
+cms.dispatcher.not_implemented=not implemented
cms.dispatcher.unknown_context=Unknown context:
-
-
+
+
# Package com.arsdigita.cms.formbuilder
# =====================================
-cms.formbuilder.cannot_create_acsobject=cannot create ACSObject
-cms.formbuilder.cannot_instantiate_object=cannot instantiate object
-cms.formbuilder.no_such_form=no such form
-cms.formbuilder.roll_me_back=Roll me back
+cms.formbuilder.cannot_create_acsobject=cannot create ACSObject
+cms.formbuilder.cannot_instantiate_object=cannot instantiate object
+cms.formbuilder.no_such_form=no such form
+cms.formbuilder.roll_me_back=Revert changes
cms.formbuilder.css=Cascading Style Sheet (CSS) Class Attribute
-
-
+
+
# Package com.arsdigita.cms.installer
# =====================================
cms.installer.approval=Approval
-cms.installer.article=Article
+cms.installer.article=Article
cms.installer.authoring=Authoring
-cms.installer.cannot_find_cms_package_type=cannot find CMS package type
-cms.installer.cannot_find_content_type=cannot find content type
-cms.installer.cannot_find_file=cannot find file
-cms.installer.cannot_find_group_for_email=Cannot find group for email
-cms.installer.cannot_read_line_of_data=Cannot read line of data
-cms.installer.cannot_set_template_text=Cannot set template text
+cms.installer.cannot_find_cms_package_type=cannot find CMS package type
+cms.installer.cannot_find_content_type=cannot find content type
+cms.installer.cannot_find_file=cannot find file
+cms.installer.cannot_find_group_for_email=Cannot find group for email
+cms.installer.cannot_read_line_of_data=Cannot read line of data
+cms.installer.cannot_set_template_text=Cannot set template text
cms.installer.could_not_load_section=Could not load ContentSection named '{0}'
cms.installer.deploy=Deploy
cms.installer.failed_to_update_the_default_content_section=Failed to update the default content section.
-cms.installer.formbuilder.form=Form
-cms.installer.formbuilder.form_section=Form Section
+cms.installer.formbuilder.form=Form
+cms.installer.formbuilder.form_section=Form Section
cms.installer.production_workflow=Production Workflow
-cms.installer.root_folder=Root Folder
-cms.installer.root_site_node_missing=Root site node missing
+cms.installer.root_folder=Root Folder
+cms.installer.root_site_node_missing=Root site node missing
cms.installer.simple_publication=Simple Publication
cms.installer.template=Template
-
+
# Package com.arsdigita.cms.lifecycle
# ===================================
-cms.lifecycle.could_not_fetch_lifecycle=Could not fetch lifecycle:
-cms.lifecycle.could_not_fetch_phase=Could not fetch phase:
+cms.lifecycle.could_not_fetch_lifecycle=Could not fetch lifecycle:
+cms.lifecycle.could_not_fetch_phase=Could not fetch phase:
# Package com.arsdigita.cms.publishToFile
# =======================================
-cms.publishToFile.cannot_find_file=cannot find file
-cms.publishToFile.cannot_find_item_class=cannot find item class
-cms.publishToFile.cannot_find_server=cannot find server
-cms.publishToFile.cannot_get_sequence_value=cannot get sequence value
-cms.publishToFile.cannot_read_template_text=cannot read template text
-cms.publishToFile.could_not_get_object_for_oid=Could not get object for oid
-cms.publishToFile.error_executing=Error executing '{0}' :
-cms.publishToFile.exit_value_was=Exit value was
-cms.publishToFile.interrupted_when_doing=interrupted when doing '{0}'
-cms.publishToFile.invalid_brokenlinkaction=Invalid BrokenLinkAction:
-cms.publishToFile.invalid_reference_target_type=Invalid reference target type:
-cms.publishToFile.malformed_url=Malformed URL:
-cms.publishToFile.not_found_in_servers_list= not found in servers list
-cms.publishToFile.publish_to_file_listener_could_not_be_created=Publish to file listener could not be created:
-cms.publishToFile.publish_to_file_setlocalrequestpassword_could_not_be_created=Publish to file SetLocalRequestPassword could not be created:
-cms.publishToFile.publishsource_sourcebase_must_end_in_=PublishSource sourceBase must end in '/'
-cms.publishToFile.server=server
-cms.publishToFile.unable_to_find_closing_for_tag=Unable to find closing '>' for tag.
+cms.publishToFile.cannot_find_file=cannot find file
+cms.publishToFile.cannot_find_item_class=cannot find item class
+cms.publishToFile.cannot_find_server=cannot find server
+cms.publishToFile.cannot_get_sequence_value=cannot get sequence value
+cms.publishToFile.cannot_read_template_text=cannot read template text
+cms.publishToFile.could_not_get_object_for_oid=Could not get object for oid
+cms.publishToFile.error_executing=Error executing '{0}' :
+cms.publishToFile.exit_value_was=Exit value was
+cms.publishToFile.interrupted_when_doing=interrupted when doing '{0}'
+cms.publishToFile.invalid_brokenlinkaction=Invalid BrokenLinkAction:
+cms.publishToFile.invalid_reference_target_type=Invalid reference target type:
+cms.publishToFile.malformed_url=Malformed URL:
+cms.publishToFile.not_found_in_servers_list= not found in servers list
+cms.publishToFile.publish_to_file_listener_could_not_be_created=Publish to file listener could not be created:
+cms.publishToFile.publish_to_file_setlocalrequestpassword_could_not_be_created=Publish to file SetLocalRequestPassword could not be created:
+cms.publishToFile.publishsource_sourcebase_must_end_in_=PublishSource sourceBase must end in '/'
+cms.publishToFile.server=server
+cms.publishToFile.unable_to_find_closing_for_tag=Unable to find closing '>' for tag.
cms.publishToFile.unable_to_get_contentitem=Unable to get contentItem:
-
+
# cms.tasks.ui.anyone=Anyone
# cms.tasks.ui.assigned_to=Assigned To:
# cms.tasks.ui.assignment_info=Assignment Info
@@ -220,41 +220,41 @@
# cms.tasks.ui.workflow=Workflow
-
+
# Package com.arsdigita.cms.ui
# ============================
cms.ui.action=Action
cms.ui.actions=Actions
cms.ui.all_items=All Items
-cms.ui.assigned_categories=Assigned Categories:
+cms.ui.assigned_categories=Assigned Categories:
cms.ui.attention=Attention
cms.ui.Authoring=Authoring
-cms.ui.available_categories=Available Categories:
+cms.ui.available_categories=Available Categories:
cms.ui.browse=Browse
-cms.ui.browse_items_by_category=Browse items by category
+cms.ui.browse_items_by_category=Browse items by category
cms.ui.cancel=Cancel
-cms.ui.cancel_hit=Cancel hit
-cms.ui.cancelled=cancelled
+cms.ui.cancel_hit=Cancel hit
+cms.ui.cancelled=cancelled
cms.ui.cannot_assign_groups_to_owner=cannot assign groups to owner
cms.ui.categories=Categories
cms.ui.choose_target_folder=Choose target folder
cms.ui.content_center=Content center
cms.ui.content_item=Content item
cms.ui.content_section=Content section
-cms.ui.content_section_configuration=<h2>Content Section Configuration</h2>
+cms.ui.content_section_configuration=<h2>Content Section Configuration</h2>
cms.ui.content_types=Content types
-cms.ui.contents_of=Contents of
+cms.ui.contents_of=Contents of
cms.ui.create=Create
cms.ui.cse=Soon Expired
-cms.ui.default_locale=Default Locale:
+cms.ui.default_locale=Default Locale:
cms.ui.delete=Delete
cms.ui.description=Description
cms.ui.edit=Edit
cms.ui.edit_folder=Rename the current folder
cms.ui.email=Email
-cms.ui.enter_a_keyword=Enter a keyword:
-cms.ui.enter_first_name_last_name_andor_email_address=Enter first name, last name, and/or email address:
-cms.ui.enter_first_name_last_name_email_address_andor_group_name=Enter first name, last name, email address and/or Group Name:
+cms.ui.enter_a_keyword=Enter a keyword:
+cms.ui.enter_first_name_last_name_andor_email_address=Enter first name, last name, and/or email address:
+cms.ui.enter_first_name_last_name_email_address_andor_group_name=Enter first name, last name, email address and/or Group Name:
cms.ui.failed_to_create_new_dp_item=Failed to create a new DP Item.
cms.ui.failed_to_fetch_content_section_for_item=Failed to fetch the content section for the item:
cms.ui.failed_to_fetch_content_type=Failed to fetch content type for
@@ -269,12 +269,12 @@
cms.ui.for=for
cms.ui.help=Help
cms.ui.History=History
-cms.ui.history.history=History
-cms.ui.history.no_history=No History
-cms.ui.history.preview=Preview
-cms.ui.history.rollback=Rollback
-cms.ui.insufficient_privileges=Insufficient Privileges
-cms.ui.invalid_item_id=Invalid item id:{0}
+cms.ui.history.history=History
+cms.ui.history.no_history=No History
+cms.ui.history.preview=Preview
+cms.ui.history.rollback=Rollback
+cms.ui.insufficient_privileges=Insufficient Privileges
+cms.ui.invalid_item_id=Invalid item id:{0}
cms.ui.item=Content item
cms.ui.item_name_already_in_folder=That title is already in use by another item in this folder:
cms.ui.label=Label
@@ -285,9 +285,9 @@
cms.ui.language_instance.new=New Language Instance
cms.ui.language_instances=Language Instances
cms.ui.lifecycles=Lifecycles
-cms.ui.locales=Locales:
-cms.ui.logout_failed=Logout failed
-cms.ui.matches=Matches
+cms.ui.locales=Locales:
+cms.ui.logout_failed=Logout failed
+cms.ui.matches=Matches
cms.ui.max_launch=Maximum Launch Date
cms.ui.min_launch=Minimum Launch Date
cms.ui.my_workspace=My Portal
@@ -297,133 +297,133 @@
cms.ui.new_folder=Create new folder
cms.ui.new_item=New Item
cms.ui.no=No
-cms.ui.no_content_section_for_page=No content section for page
-cms.ui.no_items_matched_the_search=No items matched the search
+cms.ui.no_content_section_for_page=No content section for page
+cms.ui.no_items_matched_the_search=No items matched the search
cms.ui.none=None
cms.ui.parent=Parent
-cms.ui.permissions=Permissions
-cms.ui.preview=Preview
+cms.ui.permissions=Permissions
+cms.ui.preview=Preview
cms.ui.primary_instance=Primary Instance
cms.ui.Publishing=Publishing
cms.ui.remove=Remove
cms.ui.reports=Reports
-cms.ui.restore_default_permissions=Restore Default Permissions
+cms.ui.restore_default_permissions=Restore Default Permissions
cms.ui.roles=Roles
cms.ui.save=Save
cms.ui.search=Search
cms.ui.search_prompt=Search to add new members
-cms.ui.search_to_add_new_members=Search to Add New Members
+cms.ui.search_to_add_new_members=Search to Add New Members
cms.ui.search_errors.empty_terms=Please enter some search terms
cms.ui.search_errors.bad_terms=Your search terms contain illegal words or characters
cms.ui.search_no_results=Sorry. Your search returned 0 results.
cms.ui.select_one=--select one--
cms.ui.sign_out=Sign out
-cms.ui.submission_cancelled=Submission Cancelled
+cms.ui.submission_cancelled=Submission Cancelled
cms.ui.Summary=Summary
cms.ui.tasks_due_date=Due date
cms.ui.tasks_status_no_colon=Status
cms.ui.template=Template
cms.ui.Templates=Templates
-cms.ui.the_model_is_empty=The model is empty
-cms.ui.there_are_no_items=There are no items.
-cms.ui.there_was_no_one_matching_the_search_criteria=There was no one matching the search criteria.
-cms.ui.this_should_never_happen=This should never happen
+cms.ui.the_model_is_empty=The model is empty
+cms.ui.there_are_no_items=There are no items.
+cms.ui.there_was_no_one_matching_the_search_criteria=There was no one matching the search criteria.
+cms.ui.this_should_never_happen=This should never happen
cms.ui.types=Content types
cms.ui.unknown=unknown
cms.ui.upload_new_content=Upload new content
-cms.ui.use_custom_permissions=Use Custom Permissions
+cms.ui.use_custom_permissions=Use Custom Permissions
cms.ui.user=User
cms.ui.user_admin=User administration
cms.ui.user_not_found=User not found
-cms.ui.util.=
+cms.ui.util.=
# cms.ui.view_all_enabled_tasks=View all enabled tasks //currently not used//
# cms.ui.view_all_enabled_tasks=View all {0} enabled tasks //currently not used//
-cms.ui.view_tasks_sorted_by_due_date=View tasks sorted by due date
+cms.ui.view_tasks_sorted_by_due_date=View tasks sorted by due date
cms.ui.viewers=Viewers
-cms.ui.welcome=Welcome CMS USER
+cms.ui.welcome=Welcome CMS USER
cms.ui.workflow=Workflow
cms.ui.workflows=Workflows
cms.ui.workflow_profile_exists_on_selected_folder=Workflow Profile exists on selected folder
cms.ui.yes=Yes
-cms.ui.you_do_not_have_sufficient_privileges_to_access_this_page=You do not have sufficient privileges to access this page.
+cms.ui.you_do_not_have_sufficient_privileges_to_access_this_page=You do not have sufficient privileges to access this page.
cms.ui.item_search.page_title=Item Search
cms.ui.item_search.browse=Browse
cms.ui.item_search.search=Search
-
+
# Package com.arsdigita.cms.ui.authoring
# ======================================
-cms.ui.authoring.an_item_with_this_name_already_exists=An item with this name already exists
-cms.ui.authoring.bad_getblob_datatype=Bad getBlob datatype
-cms.ui.authoring.bad_getclob_datatype=Bad getClob datatype
-cms.ui.authoring.body=Body:
-cms.ui.authoring.caption=Caption:
-cms.ui.authoring.content_type=Content Type:
-cms.ui.authoring.couldnt_create_contentpage=Couldn't create ContentPage
-cms.ui.authoring.edit_body_text=Edit Body Text:
-cms.ui.authoring.edit_caption=Edit caption
-cms.ui.authoring.file_action=File Action
+cms.ui.authoring.an_item_with_this_name_already_exists=An item with this name already exists
+cms.ui.authoring.bad_getblob_datatype=Bad getBlob datatype
+cms.ui.authoring.bad_getclob_datatype=Bad getClob datatype
+cms.ui.authoring.body=Body:
+cms.ui.authoring.caption=Caption:
+cms.ui.authoring.content_type=Content Type:
+cms.ui.authoring.couldnt_create_contentpage=Couldn't create ContentPage
+cms.ui.authoring.edit_body_text=Edit Body Text:
+cms.ui.authoring.edit_caption=Edit caption
+cms.ui.authoring.file_action=File Action
cms.ui.authoring.file_upload.auto_detect=(Auto-detect)
cms.ui.authoring.file_upload.file_type=File Type:
-cms.ui.authoring.image_action=Image Action
+cms.ui.authoring.image_action=Image Action
cms.ui.authoring.invalid_create_component=Creation component for parent content type is invalid.
-cms.ui.authoring.missing_content_type=Missing content type
-cms.ui.authoring.missing_item_id=Missing item id
-cms.ui.authoring.name=Name:
-cms.ui.authoring.name_url=Name (URL):
-cms.ui.authoring.no_asset=No asset
-cms.ui.authoring.no_content_types_were_found=No content types were found
-cms.ui.authoring.no_current_wizard=No current wizard
+cms.ui.authoring.missing_content_type=Missing content type
+cms.ui.authoring.missing_item_id=Missing item id
+cms.ui.authoring.name=Name:
+cms.ui.authoring.name_url=Name (URL):
+cms.ui.authoring.no_asset=No asset
+cms.ui.authoring.no_content_types_were_found=No content types were found
+cms.ui.authoring.no_current_wizard=No current wizard
cms.ui.authoring.none=<i>none</i>
-cms.ui.authoring.not_implemented=Not Implemented
-cms.ui.authoring.page_launch_date=Launch Date:
-cms.ui.authoring.page_title=Page Title:
-cms.ui.authoring.remove_image=Remove image
-cms.ui.authoring.select_an_existing_image=Select an existing image
-cms.ui.authoring.sql_error_in_getting_byte_content=SQL Error in getting byte content!
-cms.ui.authoring.sqle=SQLE
+cms.ui.authoring.not_implemented=Not Implemented
+cms.ui.authoring.page_launch_date=Launch Date:
+cms.ui.authoring.page_title=Page Title:
+cms.ui.authoring.remove_image=Remove image
+cms.ui.authoring.select_an_existing_image=Select an existing image
+cms.ui.authoring.sql_error_in_getting_byte_content=SQL Error in getting byte content!
+cms.ui.authoring.sqle=SQLE
cms.ui.authoring.steps=Authoring steps
-cms.ui.authoring.submission_cancelled=Submission Cancelled
-cms.ui.authoring.text_type=Text Type:
-cms.ui.authoring.this_article_does_not_have_an_image=This article does not have an image.
-cms.ui.authoring.title=Title:
-cms.ui.authoring.unable_to_load_file=Unable to load file:
-cms.ui.authoring.upload_a_new_image=Upload a new image
+cms.ui.authoring.submission_cancelled=Submission Cancelled
+cms.ui.authoring.text_type=Text Type:
+cms.ui.authoring.this_article_does_not_have_an_image=This article does not have an image.
+cms.ui.authoring.title=Title:
+cms.ui.authoring.unable_to_load_file=Unable to load file:
+cms.ui.authoring.upload_a_new_image=Upload a new image
cms.ui.authoring.upload_image=Upload Image:
cms.ui.authoring.upload_image=Upload Image:
cms.ui.authoring.workflow=Select a Workflow
-
+
# Package com.arsdigita.cms.ui.authoringkit
# =========================================
-cms.ui.authoringkit.authoring_kit_for=Authoring Kit for
+cms.ui.authoringkit.authoring_kit_for=Authoring Kit for
cms.ui.authoringkit.authoring_kit_has_more_than_one_step=This authoring kit has more than one step:
cms.ui.authoringkit.authoring_kit_has_no_steps=This authoring kit has no steps:
-cms.ui.authoringkit.component=Component:
-cms.ui.authoringkit.content_type_id=Content Type ID#
-cms.ui.authoringkit.create_component=Create Component:
-cms.ui.authoringkit.createcomponent=CreateComponent:
-cms.ui.authoringkit.current_row_does_not_exists=Current row does not exists
-cms.ui.authoringkit.description=Description:
+cms.ui.authoringkit.component=Component:
+cms.ui.authoringkit.content_type_id=Content Type ID#
+cms.ui.authoringkit.create_component=Create Component:
+cms.ui.authoringkit.createcomponent=CreateComponent:
+cms.ui.authoringkit.current_row_does_not_exists=Current row does not exists
+cms.ui.authoringkit.description=Description:
cms.ui.authoringkit.description_bundle=Description Bundle
cms.ui.authoringkit.description_key=Description Key
-cms.ui.authoringkit.do_you_really_want_to_delete_this_authoring_step=Do you really want to delete this authoring step?
-cms.ui.authoringkit.label=Label:
+cms.ui.authoringkit.do_you_really_want_to_delete_this_authoring_step=Do you really want to delete this authoring step?
+cms.ui.authoringkit.label=Label:
cms.ui.authoringkit.label_bundle=Label Bundle
cms.ui.authoringkit.label_key=Label Key
-cms.ui.authoringkit.ordering=Ordering:
-cms.ui.authoringkit.submission_cancelled=Submission Cancelled
+cms.ui.authoringkit.ordering=Ordering:
+cms.ui.authoringkit.submission_cancelled=Submission Cancelled
-
+
# Package com.arsdigita.cms.ui.category
# =====================================
cms.ui.category.add=Add category
cms.ui.category.add_index_item=Set index item
cms.ui.category.add_use_context=Add Use Context
-cms.ui.category.assigned_purposes=Assigned Purposes:
-cms.ui.category.available_purposes=Available Purposes:
-cms.ui.category.back= (back)
+cms.ui.category.assigned_purposes=Assigned Purposes:
+cms.ui.category.available_purposes=Available Purposes:
+cms.ui.category.back= (back)
cms.ui.category.batch_categorized_objects=Batch Order Items in This Category
cms.ui.category.batch_order_objects_order=Priority
cms.ui.category.batch_order_objects_title=Title
@@ -433,12 +433,12 @@
cms.ui.category.content_item=Content Item
cms.ui.category.delete=Delete category
cms.ui.category.delete_prompt=Are you sure you want to delete this category?
-cms.ui.category.descriptionn=Description:\n
+cms.ui.category.descriptionn=Description:\n
cms.ui.category.details=Category details
cms.ui.category.edit=Edit category
-cms.ui.category.edit_index_item=Edit index item
+cms.ui.category.edit_index_item=Edit index item
cms.ui.category.edit_a_category=Edit a Category
-cms.ui.category.edit_purposes=Edit purposes
+cms.ui.category.edit_purposes=Edit purposes
cms.ui.category.index_item.select=Select an index item for this category
cms.ui.category.index_item=Index item
cms.ui.category.intro=Select a category
@@ -447,7 +447,7 @@
cms.ui.category.is_not_abstract=Can you place objects in this category?
cms.ui.category.item.none=There are no items in this category
cms.ui.category.item=Categorized item
-cms.ui.category.labeln=Label:\n
+cms.ui.category.labeln=Label:\n
cms.ui.category.linked=Linked categories
cms.ui.category.linked_add=Add or remove linked categories
cms.ui.category.linked_none=This category has no linked categories
@@ -464,9 +464,9 @@
cms.ui.category.localization_url=URL
cms.ui.category.name_not_unique=There is already a category with this name
cms.ui.category.no_categorized_objects=There are no categorized objects
-cms.ui.category.no_category_purposes=No Category Purposes
+cms.ui.category.no_category_purposes=No Category Purposes
cms.ui.category.no_linked_categories=No linked categories
-cms.ui.category.no_subcategories=No subcategories
+cms.ui.category.no_subcategories=No subcategories
cms.ui.category.purpose_add=Add or remove category purposes
cms.ui.category.purpose_assigned=Assigned purposes
cms.ui.category.purpose_available=Available purposes
@@ -483,9 +483,9 @@
cms.ui.category.use_context=Use Context
cms.ui.category.use_contexts=Use Contexts
cms.ui.category.use_context_must_be_unique=Use context must be unique within a Content Section.
-cms.ui.category.view_index_item=View index item
+cms.ui.category.view_index_item=View index item
-
+
# Package com.arsdigita.cms.ui.cse
# ================================
cms.ui.cse.authorName=Author
@@ -496,42 +496,42 @@
cms.ui.cse.editLink=edit
cms.ui.cse.endDateTime=Live Until
-
+
# Package com.arsdigita.cms.ui.folder
# ===================================
-cms.ui.folder.cancelled=cancelled
-cms.ui.folder.cannot_find_a_root_folder=Cannot find a root folder.
-cms.ui.folder.na=N/A
-cms.ui.folder.no_source_items_specified=No source items specified.
+cms.ui.folder.cancelled=cancelled
+cms.ui.folder.cannot_find_a_root_folder=Cannot find a root folder.
+cms.ui.folder.na=N/A
+cms.ui.folder.no_source_items_specified=No source items specified.
cms.ui.folder.parent=Parent Folder
cms.ui.folder.rename=Rename folder
-
-
+
+
# Package com.arsdigita.cms.ui.formbuilder
# ========================================
-cms.ui.formbuilder.description=Description:
-cms.ui.formbuilder.name=Name:
-cms.ui.formbuilder.oh_no_you_dont=Oh no you don't
-cms.ui.formbuilder.title=Title:
+cms.ui.formbuilder.description=Description:
+cms.ui.formbuilder.name=Name:
+cms.ui.formbuilder.oh_no_you_dont=Oh no you don't
+cms.ui.formbuilder.title=Title:
-
+
# Package com.arsdigita.cms.ui.item
# =================================
-cms.ui.item.access_denied=Access denied.
-cms.ui.item.apply_a_lifecycle=Apply a Lifecycle
+cms.ui.item.access_denied=Access denied.
+cms.ui.item.apply_a_lifecycle=Apply a Lifecycle
cms.ui.item.authoring=Authoring
cms.ui.item.categories.assigned=Assigned categories
cms.ui.item.categories.available=Available categories
-cms.ui.item.current_row_does_not_exist=Current row does not exist
+cms.ui.item.current_row_does_not_exist=Current row does not exist
cms.ui.item.days=days
-cms.ui.item.edit_lifecycle=Edit Lifecycle
+cms.ui.item.edit_lifecycle=Edit Lifecycle
cms.ui.item.end_date=End date:
cms.ui.item.end_time=End time:
-cms.ui.item.end_time_incomplete=End time incomplete
+cms.ui.item.end_time_incomplete=End time incomplete
cms.ui.item.history=History
-cms.ui.item.hours=hours
-cms.ui.item.invalid_end_date_please_try_again=Invalid end date, please try again
-cms.ui.item.invalid_start_date_please_try_again=Invalid start date, please try again
+cms.ui.item.hours=hours
+cms.ui.item.invalid_end_date_please_try_again=Invalid end date, please try again
+cms.ui.item.invalid_start_date_please_try_again=Invalid start date, please try again
cms.ui.item.language.add=Add language
cms.ui.item.language.change=Change language
cms.ui.item.languages=Languages
@@ -554,7 +554,7 @@
cms.ui.item.notification_period=Notify in advance:
cms.ui.item.notification_period_before_start=The period for advance notification must not be longer than the publishing period.
cms.ui.item.preview=Preview
-cms.ui.item.reapply_a_lifecycle=Re-apply a Lifecycle
+cms.ui.item.reapply_a_lifecycle=Re-apply a Lifecycle
cms.ui.item.revision.added=Added To
cms.ui.item.revision.current=Current revision
cms.ui.item.revision.difference_show=Show difference
@@ -583,21 +583,21 @@
cms.ui.item.revisions=Revisions
cms.ui.item.start_date=Start date:
cms.ui.item.start_time=Start time:
-cms.ui.item.start_time_incomplete=Start time incomplete
-cms.ui.item.submission_cancelled=Submission Cancelled
+cms.ui.item.start_time_incomplete=Start time incomplete
+cms.ui.item.submission_cancelled=Submission Cancelled
cms.ui.item.summary=Summary
cms.ui.item.templates=Templates
-cms.ui.item.the_current_row_does_not_exists=The current row does not exists
+cms.ui.item.the_current_row_does_not_exists=The current row does not exists
cms.ui.item.workflow=Workflow
cms.ui.item.workflow.start=Start workflow
cms.ui.item.workflow.stop=Stop workflow
-
+
# Package com.arsdigita.cms.ui.lifecycle
# ======================================
cms.ui.lifecycle.add=Create new lifecycle
-cms.ui.lifecycle.add_a_phase=Add a Phase
-cms.ui.lifecycle.create_a_lifecycle=Create a Lifecycle
+cms.ui.lifecycle.add_a_phase=Add a Phase
+cms.ui.lifecycle.create_a_lifecycle=Create a Lifecycle
cms.ui.lifecycle.days=Days
cms.ui.lifecycle.delete_prompt=Are you sure you want to delete this lifecycle?
cms.ui.lifecycle.delete=Delete lifecycle
@@ -608,13 +608,13 @@
cms.ui.lifecycle.forever=Forever
cms.ui.lifecycle.hours=Hours
cms.ui.lifecycle.intro=Select an existing lifecycle or create a new one
-cms.ui.lifecycle.label=Label:
-cms.ui.lifecycle.lifecycle_information=Lifecycle Information
+cms.ui.lifecycle.label=Label:
+cms.ui.lifecycle.lifecycle_information=Lifecycle Information
cms.ui.lifecycle.lifecycles=Lifecycles
cms.ui.lifecycle.mins=Mins
cms.ui.lifecycle.name=Name
cms.ui.lifecycle.name_not_unique=There is already a lifecycle with this name
-cms.ui.lifecycle.no_lifecycles_defined_for_this_section=No lifecycles defined for this section.
+cms.ui.lifecycle.no_lifecycles_defined_for_this_section=No lifecycles defined for this section.
cms.ui.lifecycle.no_phases=This lifecycle has no phases
cms.ui.lifecycle.phase_add=Add phase
cms.ui.lifecycle.phase_days=Days
@@ -631,26 +631,26 @@
cms.ui.lifecycle.phase_none=This lifecycle has no phases
cms.ui.lifecycle.phase_start_delay=Start delay
cms.ui.lifecycle.phases=Phases
-cms.ui.lifecycle.start_delay=Start Delay:
+cms.ui.lifecycle.start_delay=Start Delay:
-
+
# Package com.arsdigita.cms.ui.permissions
# ========================================
-cms.ui.permissions.add_administrator=Add administrator
-cms.ui.permissions.cannot_add_user=cannot add user
-cms.ui.permissions.cannot_retrieve_party=Cannot retrieve party
-cms.ui.permissions.column_index=Column index
-cms.ui.permissions.could_not_find_this_object=Could not find this Object
-cms.ui.permissions.current_object_is_null=current Object is null!
-cms.ui.permissions.no_users_were_selected=No users were selected.
-cms.ui.permissions.not_an_object_adminstrator=not an object adminstrator
-cms.ui.permissions.out_of_bounds= out of bounds
-cms.ui.permissions.remove=remove
-cms.ui.permissions.return_to_object_info=Return to object info
-cms.ui.permissions.these_are_the_current_permissions_for_this_folder=These are the current permissions for this folder.
-cms.ui.permissions.these_are_the_custom_permissions_that_have_been_granted_on_this_object=These are the custom permissions that have been granted on this object.
+cms.ui.permissions.add_administrator=Add administrator
+cms.ui.permissions.cannot_add_user=cannot add user
+cms.ui.permissions.cannot_retrieve_party=Cannot retrieve party
+cms.ui.permissions.column_index=Column index
+cms.ui.permissions.could_not_find_this_object=Could not find this Object
+cms.ui.permissions.current_object_is_null=current Object is null!
+cms.ui.permissions.no_users_were_selected=No users were selected.
+cms.ui.permissions.not_an_object_adminstrator=not an object adminstrator
+cms.ui.permissions.out_of_bounds= out of bounds
+cms.ui.permissions.remove=remove
+cms.ui.permissions.return_to_object_info=Return to object info
+cms.ui.permissions.these_are_the_current_permissions_for_this_folder=These are the current permissions for this folder.
+cms.ui.permissions.these_are_the_custom_permissions_that_have_been_granted_on_this_object=These are the custom permissions that have been granted on this object.
-
+
# Package com.arsdigita.cms.ui.portlet
# ====================================
cms.ui.portlet.tasks.no_assigned_tasks=You currently have no assigned tasks.
@@ -669,7 +669,7 @@
cms.ui.reports.css.subfolderCount=Subfolders
cms.ui.reports.css.contentType=Content Type
cms.ui.reports.css.draft=Draft
-cms.ui.reports.css.live=Live
+cms.ui.reports.css.live=Live
# Package com.arsdigita.cms.ui.role
# =================================
@@ -700,47 +700,47 @@
cms.ui.role.staff=Staff roles
cms.ui.role.viewer.add=Add a viewer role
cms.ui.role.viewers=Viewer roles
-
+
# Package com.arsdigita.cms.ui.staff
# ==================================
cms.ui.staff.add_member=Add member
cms.ui.staff.add_role=Create new role
-cms.ui.staff.create_a_role=Create a role
+cms.ui.staff.create_a_role=Create a role
cms.ui.staff.delete_confirmation_prompt=Are you sure you want to delete this role?
-cms.ui.staff.description=Description
-cms.ui.staff.edit_a_role=Edit a Role
+cms.ui.staff.description=Description
+cms.ui.staff.edit_a_role=Edit a Role
cms.ui.staff.edit_role=Edit role
-cms.ui.staff.label=Label
+cms.ui.staff.label=Label
cms.ui.staff.no_roles_defined=No roles are defined for this section
-cms.ui.staff.privileges=Privileges
-cms.ui.staff.remove=Remove
+cms.ui.staff.privileges=Privileges
+cms.ui.staff.remove=Remove
cms.ui.staff.role_description=Description
cms.ui.staff.role_details=Role details
cms.ui.staff.role_intro=Select an existing role or create a new one
cms.ui.staff.role_members=Role members
cms.ui.staff.role_name=Name
cms.ui.staff.roles=Roles
-cms.ui.staff.there_are_no_administrators_for_this_role=There are no administrators for this role
+cms.ui.staff.there_are_no_administrators_for_this_role=There are no administrators for this role
-
+
# Package com.arsdigita.cms.ui.templates
# ======================================
-cms.ui.templates.assign_a_template_to=Assign a template to
-cms.ui.templates.assign_template=Assign Template
-cms.ui.templates.assign_this_template=Assign this template
+cms.ui.templates.assign_a_template_to=Assign a template to
+cms.ui.templates.assign_template=Assign Template
+cms.ui.templates.assign_this_template=Assign this template
cms.ui.templates.assigned_templates=Assigned templates
-cms.ui.templates.default=Default
-cms.ui.templates.dummy=dummy
-cms.ui.templates.label=Label:
-cms.ui.templates.name=Name:
-cms.ui.templates.no_templates=No Templates
-cms.ui.templates.not_implemented=Not Implemented
-cms.ui.templates.preview=Preview
-cms.ui.templates.remove=Remove
-cms.ui.templates.set_as_default=Set as Default
-cms.ui.templates.use_context=Use Context:
+cms.ui.templates.default=Default
+cms.ui.templates.dummy=dummy
+cms.ui.templates.label=Label:
+cms.ui.templates.name=Name:
+cms.ui.templates.no_templates=No Templates
+cms.ui.templates.not_implemented=Not Implemented
+cms.ui.templates.preview=Preview
+cms.ui.templates.remove=Remove
+cms.ui.templates.set_as_default=Set as Default
+cms.ui.templates.use_context=Use Context:
-
+
# Package com.arsdigita.cms.ui.type
# =================================
cms.ui.type.add=Add content type
@@ -788,32 +788,32 @@
cms.ui.type.year_range_wrong_order=The years in the range are out of order
cms.ui.type.year_too_anachronistic=The range dates appear abnormal
-
+
# Package com.arsdigita.cms.ui.worfklow
# =====================================
cms.ui.worfklow.task_roles=Assigned roles
cms.ui.workflow.add=Add workflow
-cms.ui.workflow.add_a_new_task_to=Add a new Task to
-cms.ui.workflow.add_task=Add Task
-cms.ui.workflow.assign_roles_for=Assign Roles for
-cms.ui.workflow.cancel_hit=Cancel hit
+cms.ui.workflow.add_a_new_task_to=Add a new Task to
+cms.ui.workflow.add_task=Add Task
+cms.ui.workflow.assign_roles_for=Assign Roles for
+cms.ui.workflow.cancel_hit=Cancel hit
cms.ui.workflow.comment=Comment
cms.ui.workflow.current_state=Current state
cms.ui.workflow.delete=Delete workflow
cms.ui.workflow.delete_prompt=Are you sure you want to delete this workflow?
-cms.ui.workflow.delete_user=delete user
-cms.ui.workflow.delete_workflow=Delete workflow
+cms.ui.workflow.delete_user=delete user
+cms.ui.workflow.delete_workflow=Delete workflow
cms.ui.workflow.description=Description
cms.ui.workflow.details=Workflow details
cms.ui.workflow.edit=Edit workflow
-cms.ui.workflow.edit_task_in=Edit Task in
+cms.ui.workflow.edit_task_in=Edit Task in
cms.ui.workflow.insufficient_privileges=You have insufficient privileges
cms.ui.workflow.intro=Select a workflow or add a new one
cms.ui.workflow.lock_tasks=Lock my tasks for this content item
-cms.ui.workflow.no_users_were_selected=No users were selected.
+cms.ui.workflow.no_users_were_selected=No users were selected.
cms.ui.workflow.num_tasks=Number of tasks
-cms.ui.workflow.restart_stopped_workflow=Restart stopped workflow
-cms.ui.workflow.stop_workflow=Stop workflow
+cms.ui.workflow.restart_stopped_workflow=Restart stopped workflow
+cms.ui.workflow.stop_workflow=Stop workflow
cms.ui.workflow.task.add=Add task
cms.ui.workflow.task.approve=Approve
cms.ui.workflow.task.approve_prompt=Approve this work?
@@ -1110,3 +1110,4 @@
cms.ui.search.create.select_edit=Select item and edit
cms.ui.clear=Clear
+cms.ui.item_search.create.folder_missing=No folder selected
Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties 2012-12-18 21:35:11 UTC (rev 2421)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties 2012-12-18 21:43:41 UTC (rev 2422)
@@ -1,16 +1,16 @@
# Package com.arsdigita.cms
# =========================
-cms.attributeset_is_already_locked=AttributeSet ist bereits gesperrt
-cms.attributeset_is_locked=AttributeSet ist gesperrt
-cms.cannot_create_xml_document=Kann XML Dokument nicht erstellen
-cms.cant_promote_folders=Can't promote folders
+cms.attributeset_is_already_locked=AttributeSet ist bereits gesperrt
+cms.attributeset_is_locked=AttributeSet ist gesperrt
+cms.cannot_create_xml_document=Kann XML Dokument nicht erstellen
+cms.cant_promote_folders=Can't promote folders
cms.classnotfoundexception=ClassNotFoundException:
-cms.illegalaccessexception=IllegalAccessException:
-cms.image.erroneous_jpeg_marker_length=Erroneous JPEG marker length
-cms.image.expected_soi_marker_first=Expected SOI marker first
+cms.illegalaccessexception=IllegalAccessException:
+cms.image.erroneous_jpeg_marker_length=Erroneous JPEG marker length
+cms.image.expected_soi_marker_first=Expected SOI marker first
cms.image.not_a_jpeg_file=Keine JPEG Datei
-cms.instantiationexception=Ausnahmebedinung bei Instantiierung:
-cms.nosuchmethodexception=NoSuchMethodException:
+cms.instantiationexception=Ausnahmebedinung bei Instantiierung:
+cms.nosuchmethodexception=NoSuchMethodException:
cms.templates=Vorlagen
cms.title=Titel
no=Nein
@@ -22,48 +22,48 @@
# Package com.arsdigita.cms.contenttypes
# ======================================
-cms.contenttypes.contact=Kontakt:
-cms.contenttypes.contact_details=Kontakt Details:
-cms.contenttypes.contact_information=Kontakt Information:
-cms.contenttypes.contactinfo=KontaktInfo:
-cms.contenttypes.cost=Kosten:
-cms.contenttypes.coudlnt_retrieve_text=Text konnte nicht gefunden werden
+cms.contenttypes.contact=Kontakt:
+cms.contenttypes.contact_details=Kontaktdetails:
+cms.contenttypes.contact_information=Kontaktinformation:
+cms.contenttypes.contactinfo=Kontaktinformation:
+cms.contenttypes.cost=Kosten:
+cms.contenttypes.coudlnt_retrieve_text=Text konnte nicht gefunden werden
cms.contenttypes.current_image=Gegenw\u00e4rtiges Bild\:
-cms.contenttypes.department=Abteilung:
-cms.contenttypes.end_date=Datum Ende:
-cms.contenttypes.end_time=Zeitpunkt Ende:
-cms.contenttypes.event_type_not_registered=Veranstaltungs-Typ noch nicht registriert
+cms.contenttypes.department=Abteilung:
+cms.contenttypes.end_date=Enddatum:
+cms.contenttypes.end_time=Ende um:
+cms.contenttypes.event_type_not_registered=Veranstaltungs-Typ nicht registriert
#used in ccm-cms-types-job
cms.contenttypes.grade=Grade:
-#used in ccm-cms-types-organization
+#used in ccm-cms-types-organization
cms.contenttypes.image=Bilder:
-cms.contenttypes.installer.article_section=Artikel Abschnitt
-cms.contenttypes.installer.article_section_for_a_multipart_article=Artikel Abschnitt f\u00fcr einen mehrteiligen Artikel
-cms.contenttypes.job_description=Beschreibung:
-cms.contenttypes.job_type_not_registered=Inhaltstyp Job nicht registriert
-cms.contenttypes.lead=Beschreibung (Lead Text):
-cms.contenttypes.legalnotice_type_not_registered=Inhaltstyp LegalNotice nicht registriert
+cms.contenttypes.installer.article_section=Artikelabschnitt
+cms.contenttypes.installer.article_section_for_a_multipart_article=Artikelabschnitt f\u00fcr einen mehrteiligen Artikel
+cms.contenttypes.job_description=Beschreibung:
+cms.contenttypes.job_type_not_registered=Inhaltstyp Job nicht registriert
+cms.contenttypes.lead=Beschreibung (Lead Text):
+cms.contenttypes.legalnotice_type_not_registered=Inhaltstyp LegalNotice nicht registriert
cms.contenttypes.link=Link:
-cms.contenttypes.link_to_map=Karte (Link)\:
-cms.contenttypes.location=Ort:
-cms.contenttypes.main_contributor=Hauptredner\:
-cms.contenttypes.minutes_type_not_registered=Inhaltstyp Minutes nicht registriert
-cms.contenttypes.news_date=Datum:
-cms.contenttypes.newsitem_type_not_registered=Inhaltstyp NewsItem nicht registriert
-cms.contenttypes.no_content_section=Kein Inhaltsabschnitt
-cms.contenttypes.no_section=Kein Abschnitt
-cms.contenttypes.opening_time=\u00d6ffnungszeit\:
+cms.contenttypes.link_to_map=Karte (Link)\:
+cms.contenttypes.location=Ort:
+cms.contenttypes.main_contributor=Hauptredner\:
+cms.contenttypes.minutes_type_not_registered=Inhaltstyp Minutes nicht registriert
+cms.contenttypes.news_date=Datum:
+cms.contenttypes.newsitem_type_not_registered=Inhaltstyp NewsItem nicht registriert
+cms.contenttypes.no_content_section=Kein Inhaltsabschnitt
+cms.contenttypes.no_section=Kein Abschnitt
+cms.contenttypes.opening_time=\u00d6ffnungszeit\:
cms.contenttypes.person_specification=Person Spezifikation:
-cms.contenttypes.pressrelease_type_not_registered=Inhaltstyp PressRelease nicht registriert
-cms.contenttypes.ref_number=Ref. Nummer\:
-cms.contenttypes.salary=Gehalt:
-cms.contenttypes.service_type_not_registered=Inhaltstyp Service nicht registriert
-cms.contenttypes.services_provided=Verf\u00fcgbare Services:
-cms.contenttypes.start_date=Start Datum:
-cms.contenttypes.start_time=Beginn um\:
-cms.contenttypes.subjectitems=Themen\:
-cms.contenttypes.summary=Beschreibung:
+cms.contenttypes.pressrelease_type_not_registered=Inhaltstyp PressRelease nicht registriert
+cms.contenttypes.ref_number=Ref. Nummer\:
+cms.contenttypes.salary=Gehalt:
+cms.contenttypes.service_type_not_registered=Inhaltstyp Service nicht registriert
+cms.contenttypes.services_provided=Verf\u00fcgbare Services:
+cms.contenttypes.start_date=Startdatum:
+cms.contenttypes.start_time=Beginn um\:
+cms.contenttypes.subjectitems=Themen:
+cms.contenttypes.summary=Beschreibung:
cms.contenttypes.title=Titel:
cms.contenttypes.template.body_text.title=Haupttext\:
cms.contenttypes.template.body_text.description=Haupttext bearbeiten
@@ -71,134 +71,134 @@
cms.contenttypes.shared.assign_categories.description=Kategorien zuweisen
cms.contenttypes.shared.attach_files.title=Dateien zuordnen
cms.contenttypes.shared.attach_files.description=Dateien anh\u00e4ngen
-cms.contenttypes.shared.basic_properties.description=Basiseigenschaften editieren
+cms.contenttypes.shared.basic_properties.description=Basiseigenschaften bearbeiten
cms.contenttypes.shared.basic_properties.title=Basiseigenschaften
cms.contenttypes.shared.body_text.title=Haupttext
-cms.contenttypes.shared.body_text.description=Haupttext editieren
+cms.contenttypes.shared.body_text.description=Haupttext bearbeiten
-
+
# Package com.arsdigita.cms.contenttypes.ui
# =========================================
-cms.contenttypes.ui.action_item=Action Item:
-cms.contenttypes.ui.address=Adresse:
-cms.contenttypes.ui.agenda_date=Zeit:
-cms.contenttypes.ui.agenda_date_and_time=Datum und Zeit:
+cms.contenttypes.ui.action_item=Aktionselement:
+cms.contenttypes.ui.address=Adresse:
+cms.contenttypes.ui.agenda_date=Zeit:
+cms.contenttypes.ui.agenda_date_and_time=Datum und Zeit:
cms.contenttypes.ui.attendees=Teilnehmer:
cms.contenttypes.ui.bodyoverview=\u00dcbersicht\:
-cms.contenttypes.ui.closing_date=Abschluss am\:
-cms.contenttypes.ui.contact_details=Kontakt Details:
-cms.contenttypes.ui.contact_info=Kontakt Info:
-cms.contenttypes.ui.contacts=Kontakte:
-cms.contenttypes.ui.content_group_current_items=Aktuelle Items:
-cms.contenttypes.ui.content_group_name=Inhalt Gruppen Name:
-cms.contenttypes.ui.content_group_new_item=Neuen Item hinzuf\u00fcgen:
-cms.contenttypes.ui.cost=Kosten:
-cms.contenttypes.ui.creation_date=Erstellungsdatum:
-cms.contenttypes.ui.date=Datum:
-cms.contenttypes.ui.department=Abteilung:
-cms.contenttypes.ui.description=Beschreibung:
+cms.contenttypes.ui.closing_date=Abschluss am\:
+cms.contenttypes.ui.contact_details=Kontaktdetails:
+cms.contenttypes.ui.contact_info=Kontaktinformation:
+cms.contenttypes.ui.contacts=Kontakte:
+cms.contenttypes.ui.content_group_current_items=Aktuelle Items:
+cms.contenttypes.ui.content_group_name=Inhalt Gruppen Name:
+cms.contenttypes.ui.content_group_new_item=Neues Dokument hinzuf\u00fcgen:
+cms.contenttypes.ui.cost=Kosten:
+cms.contenttypes.ui.creation_date=Erstellungsdatum:
+cms.contenttypes.ui.date=Datum:
+cms.contenttypes.ui.department=Abteilung:
+cms.contenttypes.ui.description=Beschreibung:
cms.contenttypes.ui.description_missing=Bitte eine Beschreibung eingeben
-cms.contenttypes.ui.description_of_minutes=Description of Minutes:
-cms.contenttypes.ui.end_date=Enddatum:
-cms.contenttypes.ui.end_time=Ende um\:
-cms.contenttypes.ui.event_start_time=Event Beginn um\:
-cms.contenttypes.ui.event_end_time=Event Ende um\:
-cms.contenttypes.ui.government_uid=Government UID:
-cms.contenttypes.ui.grade=Grad:
+cms.contenttypes.ui.description_of_minutes=Beschreibung der Tagesordnungspunkte:
+cms.contenttypes.ui.end_date=Enddatum:
+cms.contenttypes.ui.end_time=Ende um\:
+cms.contenttypes.ui.event_start_time=Veranstaltungsbeginn um:
+cms.contenttypes.ui.event_end_time=Veranstaltungsende um:
+cms.contenttypes.ui.government_uid=Government UID:
+cms.contenttypes.ui.grade=Stufe:
cms.contenttypes.ui.homepage=Homepage:
-cms.contenttypes.ui.job_description=Job Beschreibung:
-cms.contenttypes.ui.launch_date=Ver\u00f6ffentlichungsdatum:
-cms.contenttypes.ui.lead=Beschreibung (Lead Text):
-cms.contenttypes.ui.lead_line=Beschreibung (Lead Zeile):
+cms.contenttypes.ui.job_description=Stellenbeschreibung:
+cms.contenttypes.ui.launch_date=Ver\u00f6ffentlichungsdatum:
+cms.contenttypes.ui.lead=Beschreibung (Lead Text):
+cms.contenttypes.ui.lead_line=Beschreibung (Lead Zeile):
cms.contenttypes.ui.link_to_map=Lageplan:
-cms.contenttypes.ui.location=Ort:
-cms.contenttypes.ui.main_contributor=Hauptredner\:
-cms.contenttypes.ui.name=Name:
+cms.contenttypes.ui.location=Ort:
+cms.contenttypes.ui.main_contributor=Hauptredner\:
+cms.contenttypes.ui.name=Name:
cms.contenttypes.ui.opening_times=\u00d6ffnungszeiten\:
-cms.contenttypes.ui.person_specification=Person Specification:
-cms.contenttypes.ui.ref_code=Ref. Code:
-cms.contenttypes.ui.ref_number=Ref. Nr.:
-cms.contenttypes.ui.reference=Referenz:
-cms.contenttypes.ui.reference_code=Referenz Code:
-cms.contenttypes.ui.salary=Gehalt:
-cms.contenttypes.ui.services_provided=Verf\u00fcgbarer Service:
-cms.contenttypes.ui.start_date=Anfangsdatum:
-cms.contenttypes.ui.start_time=Anfangszeit:
+cms.contenttypes.ui.person_specification=Person Specification:
+cms.contenttypes.ui.ref_code=Ref. Code:
+cms.contenttypes.ui.ref_number=Ref. Nr.:
+cms.contenttypes.ui.reference=Referenz:
+cms.contenttypes.ui.reference_code=Referenz Code:
+cms.contenttypes.ui.salary=Gehalt:
+cms.contenttypes.ui.services_provided=Verf\u00fcgbarer Service:
+cms.contenttypes.ui.start_date=Anfangsdatum:
+cms.contenttypes.ui.start_time=Anfangszeit:
cms.contenttypes.ui.subject_items=Thema Items:
-cms.contenttypes.ui.summary=Beschreibung:
-cms.contenttypes.ui.there_are_no_events=Keine Ereignisse vorhanden
-cms.contenttypes.ui.title=Titel:
-cms.contenttypes.ui.view_image=Bild anzeigen
+cms.contenttypes.ui.summary=Beschreibung:
+cms.contenttypes.ui.there_are_no_events=Keine Ereignisse vorhanden
+cms.contenttypes.ui.title=Titel:
+cms.contenttypes.ui.view_image=Bild anzeigen
# Package com.arsdigita.cms.dispatcher
# =====================================
-cms.dispatcher.cannot_find_domain_object=Domain Object nicht auffindbar
-cms.dispatcher.could_not_find_imageasset=ImageAsset nicht auffindbar:
-cms.dispatcher.failed_to_retrieve_imageasset=ImageAsset nicht auffindbar:
-cms.dispatcher.no_permission_to_access_resource=Keine Rechte f\u00fcr diese Ressource
-cms.dispatcher.not_implemented=nicht implementiert
-cms.dispatcher.unknown_context=Unbekannter Kontext:
+cms.dispatcher.cannot_find_domain_object=Domain Object nicht auffindbar
+cms.dispatcher.could_not_find_imageasset=ImageAsset nicht auffindbar:
+cms.dispatcher.failed_to_retrieve_imageasset=ImageAsset nicht auffindbar:
+cms.dispatcher.no_permission_to_access_resource=Keine Rechte f\u00fcr diese Ressource
+cms.dispatcher.not_implemented=nicht implementiert
+cms.dispatcher.unknown_context=Unbekannter Kontext:
-
+
# Package com.arsdigita.cms.formbuilder
# =====================================
-cms.formbuilder.cannot_create_acsobject=ACSObject kann nicht erstellt werden
+cms.formbuilder.cannot_create_acsobject=ACSObject kann nicht erstellt werden
cms.formbuilder.cannot_instantiate_object=Object kann nicht instantiiert werden
cms.formbuilder.no_such_form=Form nicht vorhanden
-cms.formbuilder.roll_me_back=Roll me back
+cms.formbuilder.roll_me_back=\u00c4nderungen r\u00fcckg\u00e4ngig machen
cms.formbuilder.css=Cascading Style Sheet (CSS) Class Attribute
-
+
# Package com.arsdigita.cms.installer
-# =====================================
+# =====================================
cms.installer.approval=Akzeptieren
-cms.installer.article=Artikel
+cms.installer.article=Artikel
cms.installer.authoring=Verfassen
-cms.installer.cannot_find_cms_package_type=kann CMS Pakettyp nicht finden
-cms.installer.cannot_find_content_type=kann Inhaltstyp nicht finden
-cms.installer.cannot_find_file=kann Datei nicht finden
-cms.installer.cannot_find_group_for_email=Kann email-Gruppe nicht finden
-cms.installer.cannot_read_line_of_data=Kann Datensatz nicht lesen
-cms.installer.cannot_set_template_text=Kann Template Text nicht festlegen
-cms.installer.could_not_load_section=Kann die ContentSection '{0}' nicht laden
+cms.installer.cannot_find_cms_package_type=kann CMS Pakettyp nicht finden
+cms.installer.cannot_find_content_type=kann Inhaltstyp nicht finden
+cms.installer.cannot_find_file=kann Datei nicht finden
+cms.installer.cannot_find_group_for_email=Kann E-Mail-Gruppe nicht finden
+cms.installer.cannot_read_line_of_data=Kann Datensatz nicht lesen
+cms.installer.cannot_set_template_text=Kann Template Text nicht festlegen
+cms.installer.could_not_load_section=Kann die ContentSection '{0}' nicht laden
cms.installer.deploy=Anwenden
-cms.installer.failed_to_update_the_default_content_section=Update der Default Content Section gescheitert.
-cms.installer.formbuilder.form=Form
+cms.installer.failed_to_update_the_default_content_section=Update der Standard Content Section gescheitert.
+cms.installer.formbuilder.form=Form
cms.installer.formbuilder.form_section=Form Abschnitt
cms.installer.production_workflow=Arbeitsablauf Produktion
-cms.installer.root_folder=Basisverzeichnis
-cms.installer.root_site_node_missing=Root site node missing
+cms.installer.root_folder=Basisverzeichnis
+cms.installer.root_site_node_missing=Basisseite fehlt
cms.installer.simple_publication=Einfache Ver\u00f6ffentlichung
cms.installer.template=Vorlage
-
-
+
+
# Packag...
[truncated message content] |
|
From: <pb...@fe...> - 2012-12-18 21:35:21
|
Author: pboy
Date: 2012-12-18 21:35:11 +0000 (Tue, 18 Dec 2012)
New Revision: 2421
Added:
releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java
releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties
releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties
Modified:
releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java
Log:
Backport r2418 (Fixed UI subsite admin page) (on behalf of JensP)
Modified: releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java
===================================================================
--- releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java 2012-12-18 08:30:05 UTC (rev 2420)
+++ releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java 2012-12-18 21:35:11 UTC (rev 2421)
@@ -15,9 +15,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.arsdigita.subsite.ui;
+import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.SaveCancelSection;
@@ -37,6 +37,7 @@
import com.arsdigita.bebop.event.ParameterEvent;
import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.ParameterData;
@@ -65,7 +66,6 @@
import org.apache.log4j.Logger;
-
/**
* Class creates the administration input form.
*
@@ -76,10 +76,8 @@
/** A logger instance. */
private static final Logger s_log = Logger.getLogger(SiteForm.class);
-
private SiteSelectionModel m_site;
private BigDecimal siteDefaultRootPageID;
-
/** Input field subsite title */
private TextField m_title;
private TextField m_hostname;
@@ -89,15 +87,12 @@
private CategoryPicker m_rootCategory;
private SingleSelect m_themes;
private SaveCancelSection m_buttons;
-
private final static String DEFAULT_APP = "DEFAULT_APP";
private final static String DEFAULT_APP_LABEL = "Site Wide Default ";
-
private final static String DEFAULT_STYLE = "DEFAULT_STYLE";
private final static String DEFAULT_STYLE_LABEL = "Site Wide Default ";
private final static String OTHER_STYLE = "OTHER_STYLE";
private final static String OTHER_STYLE_LABEL = "Other (type in box below)";
-
/**
* Constructor create input widgets and adds them to form.
@@ -106,24 +101,26 @@
* @param site
*/
public SiteForm(String name, SiteSelectionModel site) {
-
- super(name, new SimpleContainer());
+
+ //super(name, new SimpleContainer());
+ super(name, new ColumnPanel(2));
setClassAttr("simpleForm");
setRedirecting(true);
-
+
m_site = site;
- String defAppPath = UI.getRootPageURL() ;
- s_log.debug("defAppPath is: " + defAppPath );
- siteDefaultRootPageID =
- Application.retrieveApplicationForPath(defAppPath )
- .getID();
+ String defAppPath = UI.getRootPageURL();
+ s_log.debug("defAppPath is: " + defAppPath);
+ siteDefaultRootPageID =
+ Application.retrieveApplicationForPath(defAppPath)
+ .getID();
/* Setup text input field for subsite title property */
m_title = new TextField(new StringParameter("title"));
m_title.addValidationListener(new NotNullValidationListener());
m_title.setMetaDataAttribute("title", "Title");
- m_title.setHint("Enter the title of the subsite, upto 80 characters");
+ m_title.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.title.hint").localize());
m_title.setSize(40);
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.title.label")));
add(m_title); // adds title input field to form
@@ -133,52 +130,49 @@
m_hostname.addValidationListener(new HostNameValidationListener());
m_hostname.setMetaDataAttribute("title", "Hostname");
m_hostname.setSize(40);
- m_hostname.setHint(
- "Enter the hostname for the subsite, eg business.example.com"
- );
+ m_hostname.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.hostname.hint").localize());
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.hostname.label")));
add(m_hostname); // adds hostname input field to form
-
+
/* Setup text input area for description property */
m_description = new TextArea(new StringParameter("description"));
m_description.addValidationListener(new NotNullValidationListener());
m_description.setMetaDataAttribute("title", "Description");
m_description.setCols(45);
m_description.setRows(4);
- m_description.setHint(
- "Enter a short description for the subsite, upto 4000 characters"
- );
+ m_description.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.description.hint").localize());
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.description.label")));
add(m_description); // adds description input field to form
/* Setup selection box for subsite start page (front page) Application
* by URL */
m_customFrontpageApp = new SingleSelect(
- new StringParameter("customFrontpageApp"));
- m_customFrontpageApp.setMetaDataAttribute("title",
- "Front Page (url)");
+ new StringParameter("customFrontpageApp"));
+ m_customFrontpageApp.setMetaDataAttribute("title", "Front Page (url)");
// m_customFrontpageApp.setSize(40);
- m_customFrontpageApp.setHint(
- "Select the name (url) of the subsite custom homepage");
+ m_customFrontpageApp.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.customfrontpage.hint").
+ localize());
try {
m_customFrontpageApp.addPrintListener(new FrontpageAppListener());
} catch (TooManyListenersException ex) {
throw new UncheckedWrapperException("This cannot happen", ex);
}
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.customfrontpage.label")));
add(m_customFrontpageApp); // adds selectfield start page to form
-
+
/* Setup selection box for themes */
- m_themes = new SingleSelect(new StringParameter("selectStyleDir"));
+ m_themes = new SingleSelect(new StringParameter("selectStyleDir"));
m_themes.setMetaDataAttribute("title", "XSLT Directory");
- m_themes.setHint("Select an existing theme from the list, select" +
- " 'Other' to type something below or select" +
- " 'Site Wide Default' to get the default themes." );
+ m_themes.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.theme.hint").localize());
try {
m_themes.addPrintListener(new ThemesListener());
} catch (TooManyListenersException ex) {
throw new UncheckedWrapperException("This cannot happen", ex);
}
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.theme.label")));
add(m_themes); // adds themes selection box to form
@@ -186,31 +180,33 @@
m_styleDir = new TextField(new StringParameter("styleDir"));
m_styleDir.setMetaDataAttribute("title", "XSLT Directory (Other)");
m_styleDir.setSize(40);
- m_styleDir.setHint( "Enter the directory for the custom XSLT styles, "
- +"or leave blank for the default styling." );
+ m_styleDir.setHint("Enter the directory for the custom XSLT styles, or leave blank for the default styling.");
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.styledir.label")));
add(m_styleDir); // adds inputfield style dir to form
/* Setup selection box for cagtegory domain */
- m_rootCategory = (CategoryPicker)Classes.newInstance(
- Subsite.getConfig().getRootCategoryPicker(),
- new Class[] { String.class },
- new Object[] { "rootCategory" });
+ m_rootCategory = (CategoryPicker) Classes.newInstance(
+ Subsite.getConfig().getRootCategoryPicker(),
+ new Class[]{String.class},
+ new Object[]{"rootCategory"});
if (m_rootCategory instanceof Widget) {
- ((Widget)m_rootCategory)
- .setMetaDataAttribute("title", "Root category");
- ((Widget)m_rootCategory)
- .setHint("Select a root navigation category");
+ ((Widget) m_rootCategory).setMetaDataAttribute("title", "Root category");
+ ((Widget) m_rootCategory).setHint((String) SubsiteGlobalizationUtil.globalize(
+ "subsite.ui.root_category.hint").localize());
}
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.root_category.label")));
add(m_rootCategory); // adds domain category selection box to form
-
+
m_buttons = new SaveCancelSection();
+ m_buttons.getSaveButton().setButtonLabel(SubsiteGlobalizationUtil.globalize("subsite.ui.save"));
m_buttons.getSaveButton().setHint("Save the details in the form");
+ m_buttons.getCancelButton().setButtonLabel(SubsiteGlobalizationUtil.globalize("subsite.ui.cancel"));
m_buttons.getCancelButton().setHint("Abort changes & reset the form");
add(m_buttons);
-
+
addSubmissionListener(new SiteSubmissionListener());
addProcessListener(new SiteProcessListener());
addInitListener(new SiteInitListener());
@@ -221,8 +217,9 @@
*
*/
private class SiteSubmissionListener implements FormSubmissionListener {
- public void submitted(FormSectionEvent e)
- throws FormProcessException {
+
+ public void submitted(FormSectionEvent e)
+ throws FormProcessException {
PageState state = e.getPageState();
if (m_buttons.getCancelButton().isSelected(state)) {
@@ -230,21 +227,22 @@
throw new FormProcessException("cancel pressed");
}
}
+
}
/**
* Validate the subsite form user input.
*/
private class SiteValidationListener implements FormValidationListener {
-
+
public void validate(FormSectionEvent e) {
PageState state = e.getPageState();
if (!m_buttons.getCancelButton().isSelected(state)) {
FormData data = e.getFormData();
// make sure that if a theme was typed in that the "other"
// was selected in the theme selection box.
- String styleDir = (String)m_styleDir.getValue(state);
- String themeDir = (String)m_themes.getValue(state);
+ String styleDir = (String) m_styleDir.getValue(state);
+ String themeDir = (String) m_themes.getValue(state);
if (styleDir != null) {
styleDir = styleDir.trim();
}
@@ -254,62 +252,56 @@
// need to make sure the styleDir is null
if (OTHER_STYLE.equals(themeDir)) {
if (StringUtils.emptyString(styleDir)) {
- data.addError(
- "If you choose '" + OTHER_STYLE_LABEL +
- "' for the XSL Directory Select then " +
- "you need to provide a style in the Text Field");
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.other_style_missing",
+ new String[]{OTHER_STYLE_LABEL}));
}
} else {
if (!StringUtils.emptyString(styleDir)) {
- data.addError(
- "In order to set a in the text field, " +
- "the XSL Directory select box must say '" +
- OTHER_STYLE_LABEL + "'");
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.other_style_invalid",
+ new String[]{OTHER_STYLE_LABEL}));
}
}
-
+
/* Check whether a valid Root category has been selected. The
* default entry "-- pick one--" provides a null String
* ( null pointer exception). */
try {
Category testExist = m_rootCategory.getCategory(state);
String test = testExist.getDefaultDomainClass();
- }
- catch (Exception ex) {
- data.addError(
- "No valid category selected. Check category selection!");
+ } catch (Exception ex) {
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.root_category_missing"));
}
-
+
} // End if (!m_buttons ...)
} // End validate(FormSectionEvent e)
-
+
}
/**
* Checks whether hostname is alreafy in use.
*/
private class HostNameValidationListener implements ParameterListener {
+
public void validate(ParameterEvent e) {
ParameterData data = e.getParameterData();
- String hostname = (String)data.getValue();
-
+ String hostname = (String) data.getValue();
+
Site site = m_site.getSelectedSite(e.getPageState());
if (hostname != null && hostname.toString().length() > 0) {
DataCollection sites = SessionManager.getSession()
- .retrieve(Site.BASE_DATA_OBJECT_TYPE);
- sites.addEqualsFilter("lower("+Site.HOSTNAME+")",
+ .retrieve(Site.BASE_DATA_OBJECT_TYPE);
+ sites.addEqualsFilter("lower(" + Site.HOSTNAME + ")",
hostname.toLowerCase());
if (site != null) {
sites.addNotEqualsFilter(Site.ID, site.getID());
}
if (sites.size() > 0) {
- data.addError(
- "The host name " + hostname +
- " is already used by another site");
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.hostname_already_in_use"));
}
}
-
+
}
+
}
/**
@@ -318,14 +310,14 @@
* existing subsite or by creating a new one).
*/
private class SiteInitListener implements FormInitListener {
-
- public void init(FormSectionEvent e)
- throws FormProcessException {
+
+ public void init(FormSectionEvent e)
+ throws FormProcessException {
PageState state = e.getPageState();
Site site = m_site.getSelectedSite(state);
-
-
+
+
if (site == null) {
m_title.setValue(state, null);
m_hostname.setValue(state, null);
@@ -338,16 +330,15 @@
m_title.setValue(state, site.getTitle());
m_hostname.setValue(state, site.getHostname());
m_description.setValue(state, site.getDescription());
-
+
// BigDecimal siteDefaultRootPageID
- BigDecimal currentFrontpageID = site.getFrontPage().getID();
- s_log.debug(" Site default frontpage is: "+siteDefaultRootPageID
- +", Current frontpage is: "+currentFrontpageID) ;
+ BigDecimal currentFrontpageID = site.getFrontPage().getID();
+ s_log.debug(" Site default frontpage is: " + siteDefaultRootPageID
+ + ", Current frontpage is: " + currentFrontpageID);
m_customFrontpageApp.setValue(
state,
- currentFrontpageID == siteDefaultRootPageID ?
- DEFAULT_APP : currentFrontpageID.toString() );
-
+ currentFrontpageID == siteDefaultRootPageID ? DEFAULT_APP : currentFrontpageID.toString());
+
String styleURL = site.getStyleDirectory();
// if the value is in the config map, then styleDir is
// empty and themeDir gets the value. Otherwise, if the
@@ -374,24 +365,25 @@
m_rootCategory.setCategory(state, root);
}
}
+
}
/**
*
*/
private class SiteProcessListener implements FormProcessListener {
-
- public void process(FormSectionEvent e)
- throws FormProcessException {
-
+
+ public void process(FormSectionEvent e)
+ throws FormProcessException {
+
PageState state = e.getPageState();
-
+
Category root = m_rootCategory.getCategory(state);
Site site = m_site.getSelectedSite(state);
-
- String style = (String)m_styleDir.getValue(state);
- String theme = (String)m_themes.getValue(state);
+
+ String style = (String) m_styleDir.getValue(state);
+ String theme = (String) m_themes.getValue(state);
if (style != null) {
style = style.trim();
}
@@ -401,121 +393,119 @@
styleDir = theme;
}
}
-
+
/* Pre-process selected frontpage application: retrieve application */
String subsiteSelectedFrontpage = (String) m_customFrontpageApp
- .getValue(state);
+ .getValue(state);
s_log.debug(" Site default frontpage ID is: " + siteDefaultRootPageID
- +", selected frontpage Value is: "
- +subsiteSelectedFrontpage) ;
- Application frontpageApp ;
+ + ", selected frontpage Value is: "
+ + subsiteSelectedFrontpage);
+ Application frontpageApp;
if (subsiteSelectedFrontpage.equals(DEFAULT_APP)) {
- s_log.debug("About to create frontpage app ID: " + DEFAULT_APP );
- frontpageApp = Application
- .retrieveApplication(siteDefaultRootPageID);
+ s_log.debug("About to create frontpage app ID: " + DEFAULT_APP);
+ frontpageApp = Application
+ .retrieveApplication(siteDefaultRootPageID);
} else {
- s_log.debug("About to create frontpage app ID: "
- + subsiteSelectedFrontpage );
- frontpageApp = Application
- .retrieveApplication(new BigDecimal(subsiteSelectedFrontpage));
+ s_log.debug("About to create frontpage app ID: "
+ + subsiteSelectedFrontpage);
+ frontpageApp = Application
+ .retrieveApplication(new BigDecimal(subsiteSelectedFrontpage));
}
- Assert.exists(frontpageApp,Application.class);
- s_log.debug("Created frontpage app ID: " + frontpageApp.getID() );
-
+ Assert.exists(frontpageApp, Application.class);
+ s_log.debug("Created frontpage app ID: " + frontpageApp.getID());
+
if (site == null) { // (sub)site not yet exists, create new one
- if (!siteDefaultRootPageID.equals(frontpageApp.getID()) ) {
-
+ if (!siteDefaultRootPageID.equals(frontpageApp.getID())) {
+
// Previous version executed setRoot.... for newly created
// application, which were created for the purpose to serve
// as a dedicated front page application for the created
// subsite with an added comment:
// "NB, explicitly don't set cat on shared front page!"
- s_log.debug("Front page application ID: "
- + frontpageApp.getID() );
- s_log.debug("About to set cat on dedicated front page." );
- Category.setRootForObject(frontpageApp,root);
-
+ s_log.debug("Front page application ID: "
+ + frontpageApp.getID());
+ s_log.debug("About to set cat on dedicated front page.");
+ Category.setRootForObject(frontpageApp, root);
+
}
-
+
// actually create a new subsite
- site = Site.create((String)m_title.getValue(state),
- (String)m_description.getValue(state),
- (String)m_hostname.getValue(state),
+ site = Site.create((String) m_title.getValue(state),
+ (String) m_description.getValue(state),
+ (String) m_hostname.getValue(state),
styleDir,
root,
frontpageApp);
-
+
} else { // (sub)site already exists, modify mutable configuration
-
- site.setTitle((String)m_title.getValue(state));
- site.setDescription((String)m_description.getValue(state));
- site.setHostname((String)m_hostname.getValue(state));
+
+ site.setTitle((String) m_title.getValue(state));
+ site.setDescription((String) m_description.getValue(state));
+ site.setHostname((String) m_hostname.getValue(state));
site.setStyleDirectory(styleDir);
site.setRootCategory(root);
// XXX Check: Frontpage application was not mutable in previous
// version! Check if we explicitly have to handle cat whether
// or not frontpage is shared. See comment above!
site.setFrontPage(frontpageApp);
-
+
}
m_site.clearSelection(state);
-
+
Application app = Application
- .retrieveApplicationForPath("/navigation/");
- Category.setRootForObject(app,
- root,
+ .retrieveApplicationForPath("/navigation/");
+ Category.setRootForObject(app,
+ root,
site.getTemplateContext().getContext());
}
+
}
-
/**
*
*/
private class FrontpageAppListener implements PrintListener {
-
+
public void prepare(PrintEvent e) {
- final SingleSelect target = (SingleSelect)e.getTarget();
+ final SingleSelect target = (SingleSelect) e.getTarget();
// final PageState state = e.getPageState();
- ApplicationCollection customApps ;
+ ApplicationCollection customApps;
// target.addOption(new Option(SELECT_APP, SELECT_APP_LABEL));
target.addOption(new Option(DEFAULT_APP, DEFAULT_APP_LABEL));
-
- String[] customAppTypes = (String[])Subsite.getConfig()
- .getFrontPageApplicationTypes();
- if ( customAppTypes != null) {
- for (int i=0; i < customAppTypes.length; i++) {
+
+ String[] customAppTypes = (String[]) Subsite.getConfig()
+ .getFrontPageApplicationTypes();
+ if (customAppTypes != null) {
+ for (int i = 0; i < customAppTypes.length; i++) {
customApps = Application.retrieveAllApplications(
- customAppTypes[i]);
- while(customApps.next()) {
- /* Create an entry for each application, consisting
- * of the (BigDecimal) ID as value and the URL as
- * label. */
- String appID = customApps.get(ACSObject.ID).toString() ;
- target.addOption( new
- Option(appID ,
- ( customApps.getPrimaryURL()
- +"("+appID+")") ));
- }
+ customAppTypes[i]);
+ while (customApps.next()) {
+ /* Create an entry for each application, consisting
+ * of the (BigDecimal) ID as value and the URL as
+ * label. */
+ String appID = customApps.get(ACSObject.ID).toString();
+ target.addOption(new Option(appID,
+ (customApps.getPrimaryURL()
+ + "(" + appID + ")")));
+ }
}
-
+
}
-
+
}
-
+
}
-
-
+
/**
*
*/
private class ThemesListener implements PrintListener {
-
+
public void prepare(PrintEvent e) {
- SingleSelect target = (SingleSelect)e.getTarget();
+ SingleSelect target = (SingleSelect) e.getTarget();
PageState state = e.getPageState();
Map themes = Subsite.getConfig().getThemes();
Set entrySet = themes.entrySet();
@@ -523,7 +513,7 @@
if (entrySet != null) {
Iterator entries = entrySet.iterator();
while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry)entries.next();
+ Map.Entry entry = (Map.Entry) entries.next();
target.addOption(new Option(entry.getKey().toString(),
entry.getValue().toString()),
state);
@@ -531,6 +521,6 @@
}
target.addOption(new Option(OTHER_STYLE, OTHER_STYLE_LABEL));
}
-
+
}
}
Added: releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java
===================================================================
--- releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java (rev 0)
+++ releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java 2012-12-18 21:35:11 UTC (rev 2421)
@@ -0,0 +1,27 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.arsdigita.subsite.ui;
+
+import com.arsdigita.globalization.GlobalizedMessage;
+
+/**
+ *
+ * @author Jens Pelzetter <je...@jp...>
+ * @version $Id$
+ */
+public class SubsiteGlobalizationUtil {
+
+ public static final String BUNDLE_NAME = "com.arsdigita.subsite.ui.SubsiteResources";
+
+ public static GlobalizedMessage globalize(final String key) {
+ return new GlobalizedMessage(key, BUNDLE_NAME);
+ }
+
+ public static GlobalizedMessage globalize(final String key,
+ final Object[] args) {
+ return new GlobalizedMessage(key, BUNDLE_NAME, args);
+ }
+
+}
Added: releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties
===================================================================
--- releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties (rev 0)
+++ releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties 2012-12-18 21:35:11 UTC (rev 2421)
@@ -0,0 +1,23 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+subsite.ui.title.hint=Enter the title of the subsite, upto 80 characters
+subsite.ui.title.label=Title
+subsite.ui.hostname.hint=Enter the hostname for the subsite, eg business.example.com
+subsite.ui.hostname.label=Hostname
+subsite.ui.description.hint=Enter a short description for the subsite, up to 4000 characters
+subsite.ui.description.label=Description
+subsite.ui.customfrontpage.hint=Select the name (url) of the subsite custom homepage
+subsite.ui.customfrontpage.label=Front Page
+subsite.ui.theme.hint=Select an existing theme from the list, select 'Other' to type something below or select 'Site Wide Default' to get the default themes.
+subsite.ui.theme.label=Theme
+subsite.ui.styledir.hint=Enter the directory for the custom XSLT styles, or leave blank for the default styling.
+subsite.ui.styledir.label=Custom XSL directory
+subsite.ui.root_category.hint=Select a root navigation category for the subsite
+subsite.ui.root_category.label=Root category
+subsite.ui.save=Save
+subsite.ui.cancel=Cancel
+subsite.ui.other_style_missing=If you choose {0} for the theme you need to provide a style in the text field
+subsite.ui.other_style_invalid=To set custom XSL directory select {0} in for the theme
+subsite.ui.root_category_missing=No root category selected
+subsite.ui.hostname_already_in\ use=The hostname {0} is already used by another subsite
Added: releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties
===================================================================
--- releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties (rev 0)
+++ releases/2.0.0/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties 2012-12-18 21:35:11 UTC (rev 2421)
@@ -0,0 +1,23 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+subsite.ui.title.hint=Geben Sie den Titel der Subsite ein. Der Titel darf max. 80 Zeichen lang sein.
+subsite.ui.title.label=Titel
+subsite.ui.hostname.hint=Geben Sie den hostname, z.B. business.example.com, ein
+subsite.ui.hostname.label=Hostname
+subsite.ui.description.hint=Geben sie hier eine kurze Beschreibung der Seite ein (max. 4000 Zeichen)
+subsite.ui.description.label=Beschreibung
+subsite.ui.customfrontpage.hint=W\u00e4hlen Sie den Startseite f\u00fcr die Subsite
+subsite.ui.customfrontpage.label=Startseite
+subsite.ui.theme.hint=W\u00e4hlen Sie ein existierendes Theme aus. Um ein anderes Theme im Eingabefeld anzugeben w\u00e4hlen 'Other'. Um das Standard-Theme zu verwenden w\u00e4hlen Sie 'Site-Wide-Default'
+subsite.ui.theme.label=Theme
+subsite.ui.styledir.hint=Geben Sie den Pfad zu einem Verzeichnis mit eigenen XSL-Styles an. Um die Standard-Styles zu verwenden, lassen Sie das Feld leer.
+subsite.ui.styledir.label=Zus\u00e4tzliches XSL Verzeichnis
+subsite.ui.root_category.hint=W\u00e4hlen Sie das Kategoriensystem f\u00fcr die Subsite
+subsite.ui.root_category.label=Kategoriensystem
+subsite.ui.save=Speichern
+subsite.ui.cancel=Abbrechen
+subsite.ui.other_style_missing=Wenn Sie {0} f\u00fcr das Theme w\u00e4hlen, m\u00fcssen Sie im Textfeld ein Theme angeben
+subsite.ui.other_style_invalid=Um ein eigenes Verzeichnis mit XSL-Styles anzugeben, w\u00e4hlen Sie {0} f\u00fcr das Theme
+subsite.ui.root_category_missing=Kein Kategoriensystem ausgew\u00e4hlt
+subsite.ui.hostname_already_in\ use=Der Hostname {0} wird bereits von einer anderen Subsite verwendet
|
|
From: <pb...@fe...> - 2012-12-18 08:30:14
|
Author: pboy
Date: 2012-12-18 08:30:05 +0000 (Tue, 18 Dec 2012)
New Revision: 2420
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java
Log:
Fixed UI (Cancel dialogue adding roles, saves changes), various formatting. (on behalf of JensP)
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java 2012-12-18 08:02:21 UTC (rev 2419)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java 2012-12-18 08:30:05 UTC (rev 2420)
@@ -48,7 +48,7 @@
final String path,
final String context,
final DomainObject linkObject) {
- final long start = System.nanoTime();
+ //final long start = System.nanoTime();
DomainObject nObj = obj;
@@ -60,7 +60,7 @@
super.walk(adapter, nObj, path, context, linkObject);
- System.out.printf("Walked object in %d ms\n", (System.nanoTime() - start) / 1000000);
+ //System.out.printf("Walked object in %d ms\n", (System.nanoTime() - start) / 1000000);
}
@Override
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java 2012-12-18 08:02:21 UTC (rev 2419)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddRole.java 2012-12-18 08:30:05 UTC (rev 2420)
@@ -53,8 +53,8 @@
import java.util.TooManyListenersException;
class TaskAddRole extends CMSForm {
+
private final TaskRequestLocal m_task;
-
private final OptionGroup m_roles;
private final Submit m_add;
private final Submit m_cancel;
@@ -90,6 +90,7 @@
}
private class InitListener implements FormInitListener {
+
public final void init(final FormSectionEvent e)
throws FormProcessException {
final PageState state = e.getPageState();
@@ -104,45 +105,52 @@
m_roles.setValue(state, list.toArray());
}
+
}
private class ProcessListener implements FormProcessListener {
+
public final void process(final FormSectionEvent e)
throws FormProcessException {
final PageState state = e.getPageState();
- final CMSTask task = m_task.getTask(state);
+ if (m_add.isSelected(state)) {
+ final CMSTask task = m_task.getTask(state);
- task.removeAllGroupAssignees();
+ task.removeAllGroupAssignees();
- final String[] roles = (String[]) m_roles.getValue(state);
+ final String[] roles = (String[]) m_roles.getValue(state);
- if (roles != null) {
- for (int i = 0; i < roles.length; i++) {
- task.assignGroup(new Group(new BigDecimal(roles[i])));
+ if (roles != null) {
+ for (int i = 0; i < roles.length; i++) {
+ task.assignGroup(new Group(new BigDecimal(roles[i])));
+ }
}
+
+ task.save();
}
+ }
- task.save();
- }
}
private class SubmissionListener implements FormSubmissionListener {
+
public final void submitted(final FormSectionEvent e)
throws FormProcessException {
final PageState state = e.getPageState();
- final SecurityManager sm = Utilities.getSecurityManager(state);
+ final SecurityManager sm = CMS.getSecurityManager(state);
if (!sm.canAccess(state.getRequest(),
SecurityManager.WORKFLOW_ADMIN)) {
- throw new FormProcessException
- (lz(("cms.ui.workflow.insufficient_privileges")));
+ throw new FormProcessException(lz(("cms.ui.workflow.insufficient_privileges")));
}
}
+
}
private class RoleOptionPrintListener extends DataQueryOptionPrintListener {
+
public static final String QUERY_NAME =
- "com.arsdigita.cms.getStaffRoles";
+ "com.arsdigita.cms.getStaffRoles";
public RoleOptionPrintListener() {
super();
@@ -163,8 +171,9 @@
}
public String getValue(DataQuery d) {
- return (String)d.get("name");
+ return (String) d.get("name");
}
+
}
private static GlobalizedMessage gz(final String key) {
@@ -174,4 +183,5 @@
private static String lz(final String key) {
return (String) gz(key).localize();
}
+
}
|
Author: pboy
Date: 2012-12-18 08:02:21 +0000 (Tue, 18 Dec 2012)
New Revision: 2419
Modified:
trunk/
trunk/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources_de.properties
trunk/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java
Log:
Improved ItemSearchCreatePane (ensure a folder is selected), Fixed item publishing in ItemSearchWidget (on behalf of JensP)
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- conf
runtime
build-projects.xml
local.**.properties
build.xml
packages
nbproject
.ant-targets-build.xml
.local.ccm.properties.swp
.tmp.project.xml
.tmp.applications.list
.tmp.applications.list.swp
.local.runtime.properties.swp
.local.build.properties.swp
+ conf
runtime
build-projects.xml
local.**.properties
build.xml
packages
nbproject
.ant-targets-build.xml
.local.ccm.properties.swp
.tmp.project.xml
.tmp.applications.list
.tmp.applications.list.swp
.local.runtime.properties.swp
.local.build.properties.swp
.README.swp
Modified: trunk/ccm-cms/src/com/arsdigita/cms/CMSResources.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/CMSResources.properties 2012-12-18 07:59:19 UTC (rev 2418)
+++ trunk/ccm-cms/src/com/arsdigita/cms/CMSResources.properties 2012-12-18 08:02:21 UTC (rev 2419)
@@ -1110,3 +1110,4 @@
cms.ui.search.create.select_edit=Select item and edit
cms.ui.clear=Clear
+cms.ui.item_search.create.folder_missing=No folder selected
Modified: trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties 2012-12-18 07:59:19 UTC (rev 2418)
+++ trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties 2012-12-18 08:02:21 UTC (rev 2419)
@@ -1103,3 +1103,4 @@
cms.ui.clear=Zur\u00fccksetzen
cms.ui.type.minimum_number_of_values_bigger_than_maximum_number_of_values=Maximaler Wert kleiner als minimaler Wert
cms.ui.type.minimummaximum_number_of_values_cannot_be_negative=Keine negativen Werte erlaubt
+cms.ui.item_search.create.folder_missing=kein Ordner ausgew\u00e4hlt
Modified: trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties 2012-12-18 07:59:19 UTC (rev 2418)
+++ trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties 2012-12-18 08:02:21 UTC (rev 2419)
@@ -49,3 +49,4 @@
cms.ui.search.create.select_edit=
cms.ui.clear=
+cms.ui.item_search.create.folder_missing=
Modified: trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties 2012-12-18 07:59:19 UTC (rev 2418)
+++ trunk/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties 2012-12-18 08:02:21 UTC (rev 2419)
@@ -580,3 +580,4 @@
cms.ui.search.create.select_edit=
cms.ui.clear=
+cms.ui.item_search.create.folder_missing=
Modified: trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java 2012-12-18 07:59:19 UTC (rev 2418)
+++ trunk/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java 2012-12-18 08:02:21 UTC (rev 2419)
@@ -81,7 +81,7 @@
findByAssociatedObjectType(getPersonType()));
/*m_itemSearch.getItemField().addValidationListener(
new NotNullValidationListener());*/
- m_itemSearch.setDisableCreatePane(false);
+ m_itemSearch.setDisableCreatePane(true);
add(this.m_itemSearch);
selectedPersonNameLabel = new Label("");
@@ -188,6 +188,7 @@
GenericOrganizationalUnitPersonCollection.PERSON_ROLE),
(String) data.get(
GenericOrganizationalUnitPersonCollection.STATUS));
+ m_itemSearch.publishCreatedItem(data, personToAdd);
} else {
GenericOrganizationalUnitPersonCollection persons;
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java 2012-12-18 07:59:19 UTC (rev 2418)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java 2012-12-18 08:02:21 UTC (rev 2419)
@@ -21,8 +21,6 @@
import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.event.PrintEvent;
import com.arsdigita.bebop.event.PrintListener;
-import com.arsdigita.bebop.form.Option;
-import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.CMS;
@@ -32,15 +30,11 @@
import com.arsdigita.cms.ui.authoring.CreationSelector;
import com.arsdigita.cms.ui.authoring.NewItemForm;
import com.arsdigita.cms.ui.folder.FlatFolderPicker;
-import com.arsdigita.cms.ui.folder.FolderRequestLocal;
import com.arsdigita.cms.ui.folder.FolderSelectionModel;
import com.arsdigita.cms.ui.item.ContentItemRequestLocal;
import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.persistence.OID;
import java.math.BigDecimal;
-import java.util.TooManyListenersException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
*
@@ -56,6 +50,7 @@
public static final String PUBLISHWIDGET_PARAM = "publishWidget";
private static final String CONTENT_TYPE_ID = "ct";
private static final String FOLDER_ID = "folder_id";
+ private static final String FLAT_FOLDER = "flatFolder";
private final NewItemForm m_newItem;
private final SingleSelectionModel m_typeSel;
private final FlatFolderPicker m_folderPicker;
@@ -92,7 +87,6 @@
m_typeSel = new ParameterSingleSelectionModel(new BigDecimalParameter(CONTENT_TYPE_ID));
m_creator = new CreationSelector(m_typeSel, m_folderSel) {
-
@Override
public void editItem(final PageState state, final ContentItem item) {
@@ -108,7 +102,7 @@
final BoxPanel folderRow = new BoxPanel(BoxPanel.HORIZONTAL);
folderRow.add(new Label(GlobalizationUtil.globalize("cms.ui.item_search.create.folder_select")));
- m_folderPicker = new FlatFolderPicker("flatFolder");
+ m_folderPicker = new FlatFolderPicker(FLAT_FOLDER);
folderRow.add(m_folderPicker);
m_newItem.add(folderRow);
m_newItemSeg.add(m_newItem);
@@ -124,7 +118,6 @@
m_fallBackLink = new Link(
(String) GlobalizationUtil.globalize("cms.ui.search.create.fallback").localize(),
new PrintListener() {
-
public void prepare(final PrintEvent event) {
final Link target = (Link) event.getTarget();
final PageState state = event.getPageState();
@@ -156,7 +149,7 @@
((Label) target.getChild()).setLabel((String) GlobalizationUtil.globalize(
"cms.ui.search.create.select_close").localize());
scriptAction = "self.close();\n"
- + "return false;";
+ + "return false;";
}
target.setOnClick(String.format("window.opener.document.%s.value=\"%s\";"
@@ -251,7 +244,6 @@
final BoxPanel linkPanel = new BoxPanel(BoxPanel.VERTICAL);
final Label jsLabel = new Label("", false);
jsLabel.addPrintListener(new PrintListener() {
-
public void prepare(final PrintEvent event) {
final Label target = (Label) event.getTarget();
final PageState state = event.getPageState();
@@ -323,20 +315,28 @@
public void init(final FormSectionEvent fse) throws FormProcessException {
final PageState state = fse.getPageState();
final FormData data = fse.getFormData();
- if (((data.get("flatFolder") == null) || "".equals(data.get("flatFolder")))
+ if (((data.get(FLAT_FOLDER) == null) || "".equals(data.get(FLAT_FOLDER)))
&& (defaultFolder != null)) {
- data.put("flatFolder", defaultFolder.toString());
+ data.put(FLAT_FOLDER, defaultFolder.toString());
}
}
- public void submitted(final FormSectionEvent fse) {
+ public void submitted(final FormSectionEvent fse) throws FormProcessException {
final PageState state = fse.getPageState();
final BigDecimal typeID = m_newItem.getTypeID(state);
m_typeSel.setSelectedKey(state, typeID);
- final OID folderOID = OID.valueOf((String) m_folderPicker.getValue(state));
+
+ final String folderOidStr = (String) m_folderPicker.getValue(state);
+ if ((folderOidStr == null) || folderOidStr.isEmpty()) {
+ fse.getFormData().addError(FLAT_FOLDER, GlobalizationUtil.globalize(
+ "cms.ui.item_search.create.folder_missing"));
+ throw new FormProcessException((String) GlobalizationUtil.globalize(
+ "cms.ui.item_search.create.folder_missing").localize());
+ }
+ final OID folderOID = OID.valueOf(folderOidStr);
m_folderSel.setSelectedKey(state, folderOID.get("id"));
m_newItemSeg.setVisible(state, false);
m_creationSeg.setVisible(state, true);
Modified: trunk/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources_de.properties
===================================================================
--- trunk/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources_de.properties 2012-12-18 07:59:19 UTC (rev 2418)
+++ trunk/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventResources_de.properties 2012-12-18 08:02:21 UTC (rev 2419)
@@ -9,7 +9,7 @@
cms.contenttypes.ui.event.lead=Zusammenfassung:
#
cms.contenttypes.ui.event.start_date=Anfangs-Datum:
-cms.contenttypes.ui.event.start_time=Begin:
+cms.contenttypes.ui.event.start_time=Beginn:
cms.contenttypes.ui.event.end_date=End-Datum:
cms.contenttypes.ui.event.end_time=Ende:
cms.contenttypes.ui.event.end_date_after_start_date=Das Anfangs-Datum ist sp\u00E4ter als das End-Datum
|
|
From: <pb...@fe...> - 2012-12-18 07:59:29
|
Author: pboy
Date: 2012-12-18 07:59:19 +0000 (Tue, 18 Dec 2012)
New Revision: 2418
Added:
trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java
trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties
trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties
Modified:
trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java
Log:
Fixed UI. (on behalf of JensP)
Modified: trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java
===================================================================
--- trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java 2012-12-18 00:34:30 UTC (rev 2417)
+++ trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SiteForm.java 2012-12-18 07:59:19 UTC (rev 2418)
@@ -15,9 +15,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.arsdigita.subsite.ui;
+import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.SaveCancelSection;
@@ -37,6 +37,7 @@
import com.arsdigita.bebop.event.ParameterEvent;
import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.ParameterData;
@@ -65,7 +66,6 @@
import org.apache.log4j.Logger;
-
/**
* Class creates the administration input form.
*
@@ -76,10 +76,8 @@
/** A logger instance. */
private static final Logger s_log = Logger.getLogger(SiteForm.class);
-
private SiteSelectionModel m_site;
private BigDecimal siteDefaultRootPageID;
-
/** Input field subsite title */
private TextField m_title;
private TextField m_hostname;
@@ -89,15 +87,12 @@
private CategoryPicker m_rootCategory;
private SingleSelect m_themes;
private SaveCancelSection m_buttons;
-
private final static String DEFAULT_APP = "DEFAULT_APP";
private final static String DEFAULT_APP_LABEL = "Site Wide Default ";
-
private final static String DEFAULT_STYLE = "DEFAULT_STYLE";
private final static String DEFAULT_STYLE_LABEL = "Site Wide Default ";
private final static String OTHER_STYLE = "OTHER_STYLE";
private final static String OTHER_STYLE_LABEL = "Other (type in box below)";
-
/**
* Constructor create input widgets and adds them to form.
@@ -106,24 +101,26 @@
* @param site
*/
public SiteForm(String name, SiteSelectionModel site) {
-
- super(name, new SimpleContainer());
+
+ //super(name, new SimpleContainer());
+ super(name, new ColumnPanel(2));
setClassAttr("simpleForm");
setRedirecting(true);
-
+
m_site = site;
- String defAppPath = UI.getRootPageURL() ;
- s_log.debug("defAppPath is: " + defAppPath );
- siteDefaultRootPageID =
- Application.retrieveApplicationForPath(defAppPath )
- .getID();
+ String defAppPath = UI.getRootPageURL();
+ s_log.debug("defAppPath is: " + defAppPath);
+ siteDefaultRootPageID =
+ Application.retrieveApplicationForPath(defAppPath)
+ .getID();
/* Setup text input field for subsite title property */
m_title = new TextField(new StringParameter("title"));
m_title.addValidationListener(new NotNullValidationListener());
m_title.setMetaDataAttribute("title", "Title");
- m_title.setHint("Enter the title of the subsite, upto 80 characters");
+ m_title.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.title.hint").localize());
m_title.setSize(40);
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.title.label")));
add(m_title); // adds title input field to form
@@ -133,52 +130,49 @@
m_hostname.addValidationListener(new HostNameValidationListener());
m_hostname.setMetaDataAttribute("title", "Hostname");
m_hostname.setSize(40);
- m_hostname.setHint(
- "Enter the hostname for the subsite, eg business.example.com"
- );
+ m_hostname.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.hostname.hint").localize());
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.hostname.label")));
add(m_hostname); // adds hostname input field to form
-
+
/* Setup text input area for description property */
m_description = new TextArea(new StringParameter("description"));
m_description.addValidationListener(new NotNullValidationListener());
m_description.setMetaDataAttribute("title", "Description");
m_description.setCols(45);
m_description.setRows(4);
- m_description.setHint(
- "Enter a short description for the subsite, upto 4000 characters"
- );
+ m_description.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.description.hint").localize());
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.description.label")));
add(m_description); // adds description input field to form
/* Setup selection box for subsite start page (front page) Application
* by URL */
m_customFrontpageApp = new SingleSelect(
- new StringParameter("customFrontpageApp"));
- m_customFrontpageApp.setMetaDataAttribute("title",
- "Front Page (url)");
+ new StringParameter("customFrontpageApp"));
+ m_customFrontpageApp.setMetaDataAttribute("title", "Front Page (url)");
// m_customFrontpageApp.setSize(40);
- m_customFrontpageApp.setHint(
- "Select the name (url) of the subsite custom homepage");
+ m_customFrontpageApp.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.customfrontpage.hint").
+ localize());
try {
m_customFrontpageApp.addPrintListener(new FrontpageAppListener());
} catch (TooManyListenersException ex) {
throw new UncheckedWrapperException("This cannot happen", ex);
}
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.customfrontpage.label")));
add(m_customFrontpageApp); // adds selectfield start page to form
-
+
/* Setup selection box for themes */
- m_themes = new SingleSelect(new StringParameter("selectStyleDir"));
+ m_themes = new SingleSelect(new StringParameter("selectStyleDir"));
m_themes.setMetaDataAttribute("title", "XSLT Directory");
- m_themes.setHint("Select an existing theme from the list, select" +
- " 'Other' to type something below or select" +
- " 'Site Wide Default' to get the default themes." );
+ m_themes.setHint((String) SubsiteGlobalizationUtil.globalize("subsite.ui.theme.hint").localize());
try {
m_themes.addPrintListener(new ThemesListener());
} catch (TooManyListenersException ex) {
throw new UncheckedWrapperException("This cannot happen", ex);
}
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.theme.label")));
add(m_themes); // adds themes selection box to form
@@ -186,31 +180,33 @@
m_styleDir = new TextField(new StringParameter("styleDir"));
m_styleDir.setMetaDataAttribute("title", "XSLT Directory (Other)");
m_styleDir.setSize(40);
- m_styleDir.setHint( "Enter the directory for the custom XSLT styles, "
- +"or leave blank for the default styling." );
+ m_styleDir.setHint("Enter the directory for the custom XSLT styles, or leave blank for the default styling.");
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.styledir.label")));
add(m_styleDir); // adds inputfield style dir to form
/* Setup selection box for cagtegory domain */
- m_rootCategory = (CategoryPicker)Classes.newInstance(
- Subsite.getConfig().getRootCategoryPicker(),
- new Class[] { String.class },
- new Object[] { "rootCategory" });
+ m_rootCategory = (CategoryPicker) Classes.newInstance(
+ Subsite.getConfig().getRootCategoryPicker(),
+ new Class[]{String.class},
+ new Object[]{"rootCategory"});
if (m_rootCategory instanceof Widget) {
- ((Widget)m_rootCategory)
- .setMetaDataAttribute("title", "Root category");
- ((Widget)m_rootCategory)
- .setHint("Select a root navigation category");
+ ((Widget) m_rootCategory).setMetaDataAttribute("title", "Root category");
+ ((Widget) m_rootCategory).setHint((String) SubsiteGlobalizationUtil.globalize(
+ "subsite.ui.root_category.hint").localize());
}
+ add(new Label(SubsiteGlobalizationUtil.globalize("subsite.ui.root_category.label")));
add(m_rootCategory); // adds domain category selection box to form
-
+
m_buttons = new SaveCancelSection();
+ m_buttons.getSaveButton().setButtonLabel(SubsiteGlobalizationUtil.globalize("subsite.ui.save"));
m_buttons.getSaveButton().setHint("Save the details in the form");
+ m_buttons.getCancelButton().setButtonLabel(SubsiteGlobalizationUtil.globalize("subsite.ui.cancel"));
m_buttons.getCancelButton().setHint("Abort changes & reset the form");
add(m_buttons);
-
+
addSubmissionListener(new SiteSubmissionListener());
addProcessListener(new SiteProcessListener());
addInitListener(new SiteInitListener());
@@ -221,8 +217,9 @@
*
*/
private class SiteSubmissionListener implements FormSubmissionListener {
- public void submitted(FormSectionEvent e)
- throws FormProcessException {
+
+ public void submitted(FormSectionEvent e)
+ throws FormProcessException {
PageState state = e.getPageState();
if (m_buttons.getCancelButton().isSelected(state)) {
@@ -230,21 +227,22 @@
throw new FormProcessException("cancel pressed");
}
}
+
}
/**
* Validate the subsite form user input.
*/
private class SiteValidationListener implements FormValidationListener {
-
+
public void validate(FormSectionEvent e) {
PageState state = e.getPageState();
if (!m_buttons.getCancelButton().isSelected(state)) {
FormData data = e.getFormData();
// make sure that if a theme was typed in that the "other"
// was selected in the theme selection box.
- String styleDir = (String)m_styleDir.getValue(state);
- String themeDir = (String)m_themes.getValue(state);
+ String styleDir = (String) m_styleDir.getValue(state);
+ String themeDir = (String) m_themes.getValue(state);
if (styleDir != null) {
styleDir = styleDir.trim();
}
@@ -254,62 +252,56 @@
// need to make sure the styleDir is null
if (OTHER_STYLE.equals(themeDir)) {
if (StringUtils.emptyString(styleDir)) {
- data.addError(
- "If you choose '" + OTHER_STYLE_LABEL +
- "' for the XSL Directory Select then " +
- "you need to provide a style in the Text Field");
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.other_style_missing",
+ new String[]{OTHER_STYLE_LABEL}));
}
} else {
if (!StringUtils.emptyString(styleDir)) {
- data.addError(
- "In order to set a in the text field, " +
- "the XSL Directory select box must say '" +
- OTHER_STYLE_LABEL + "'");
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.other_style_invalid",
+ new String[]{OTHER_STYLE_LABEL}));
}
}
-
+
/* Check whether a valid Root category has been selected. The
* default entry "-- pick one--" provides a null String
* ( null pointer exception). */
try {
Category testExist = m_rootCategory.getCategory(state);
String test = testExist.getDefaultDomainClass();
- }
- catch (Exception ex) {
- data.addError(
- "No valid category selected. Check category selection!");
+ } catch (Exception ex) {
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.root_category_missing"));
}
-
+
} // End if (!m_buttons ...)
} // End validate(FormSectionEvent e)
-
+
}
/**
* Checks whether hostname is alreafy in use.
*/
private class HostNameValidationListener implements ParameterListener {
+
public void validate(ParameterEvent e) {
ParameterData data = e.getParameterData();
- String hostname = (String)data.getValue();
-
+ String hostname = (String) data.getValue();
+
Site site = m_site.getSelectedSite(e.getPageState());
if (hostname != null && hostname.toString().length() > 0) {
DataCollection sites = SessionManager.getSession()
- .retrieve(Site.BASE_DATA_OBJECT_TYPE);
- sites.addEqualsFilter("lower("+Site.HOSTNAME+")",
+ .retrieve(Site.BASE_DATA_OBJECT_TYPE);
+ sites.addEqualsFilter("lower(" + Site.HOSTNAME + ")",
hostname.toLowerCase());
if (site != null) {
sites.addNotEqualsFilter(Site.ID, site.getID());
}
if (sites.size() > 0) {
- data.addError(
- "The host name " + hostname +
- " is already used by another site");
+ data.addError(SubsiteGlobalizationUtil.globalize("subsite.ui.hostname_already_in_use"));
}
}
-
+
}
+
}
/**
@@ -318,14 +310,14 @@
* existing subsite or by creating a new one).
*/
private class SiteInitListener implements FormInitListener {
-
- public void init(FormSectionEvent e)
- throws FormProcessException {
+
+ public void init(FormSectionEvent e)
+ throws FormProcessException {
PageState state = e.getPageState();
Site site = m_site.getSelectedSite(state);
-
-
+
+
if (site == null) {
m_title.setValue(state, null);
m_hostname.setValue(state, null);
@@ -338,16 +330,15 @@
m_title.setValue(state, site.getTitle());
m_hostname.setValue(state, site.getHostname());
m_description.setValue(state, site.getDescription());
-
+
// BigDecimal siteDefaultRootPageID
- BigDecimal currentFrontpageID = site.getFrontPage().getID();
- s_log.debug(" Site default frontpage is: "+siteDefaultRootPageID
- +", Current frontpage is: "+currentFrontpageID) ;
+ BigDecimal currentFrontpageID = site.getFrontPage().getID();
+ s_log.debug(" Site default frontpage is: " + siteDefaultRootPageID
+ + ", Current frontpage is: " + currentFrontpageID);
m_customFrontpageApp.setValue(
state,
- currentFrontpageID == siteDefaultRootPageID ?
- DEFAULT_APP : currentFrontpageID.toString() );
-
+ currentFrontpageID == siteDefaultRootPageID ? DEFAULT_APP : currentFrontpageID.toString());
+
String styleURL = site.getStyleDirectory();
// if the value is in the config map, then styleDir is
// empty and themeDir gets the value. Otherwise, if the
@@ -374,24 +365,25 @@
m_rootCategory.setCategory(state, root);
}
}
+
}
/**
*
*/
private class SiteProcessListener implements FormProcessListener {
-
- public void process(FormSectionEvent e)
- throws FormProcessException {
-
+
+ public void process(FormSectionEvent e)
+ throws FormProcessException {
+
PageState state = e.getPageState();
-
+
Category root = m_rootCategory.getCategory(state);
Site site = m_site.getSelectedSite(state);
-
- String style = (String)m_styleDir.getValue(state);
- String theme = (String)m_themes.getValue(state);
+
+ String style = (String) m_styleDir.getValue(state);
+ String theme = (String) m_themes.getValue(state);
if (style != null) {
style = style.trim();
}
@@ -401,121 +393,119 @@
styleDir = theme;
}
}
-
+
/* Pre-process selected frontpage application: retrieve application */
String subsiteSelectedFrontpage = (String) m_customFrontpageApp
- .getValue(state);
+ .getValue(state);
s_log.debug(" Site default frontpage ID is: " + siteDefaultRootPageID
- +", selected frontpage Value is: "
- +subsiteSelectedFrontpage) ;
- Application frontpageApp ;
+ + ", selected frontpage Value is: "
+ + subsiteSelectedFrontpage);
+ Application frontpageApp;
if (subsiteSelectedFrontpage.equals(DEFAULT_APP)) {
- s_log.debug("About to create frontpage app ID: " + DEFAULT_APP );
- frontpageApp = Application
- .retrieveApplication(siteDefaultRootPageID);
+ s_log.debug("About to create frontpage app ID: " + DEFAULT_APP);
+ frontpageApp = Application
+ .retrieveApplication(siteDefaultRootPageID);
} else {
- s_log.debug("About to create frontpage app ID: "
- + subsiteSelectedFrontpage );
- frontpageApp = Application
- .retrieveApplication(new BigDecimal(subsiteSelectedFrontpage));
+ s_log.debug("About to create frontpage app ID: "
+ + subsiteSelectedFrontpage);
+ frontpageApp = Application
+ .retrieveApplication(new BigDecimal(subsiteSelectedFrontpage));
}
- Assert.exists(frontpageApp,Application.class);
- s_log.debug("Created frontpage app ID: " + frontpageApp.getID() );
-
+ Assert.exists(frontpageApp, Application.class);
+ s_log.debug("Created frontpage app ID: " + frontpageApp.getID());
+
if (site == null) { // (sub)site not yet exists, create new one
- if (!siteDefaultRootPageID.equals(frontpageApp.getID()) ) {
-
+ if (!siteDefaultRootPageID.equals(frontpageApp.getID())) {
+
// Previous version executed setRoot.... for newly created
// application, which were created for the purpose to serve
// as a dedicated front page application for the created
// subsite with an added comment:
// "NB, explicitly don't set cat on shared front page!"
- s_log.debug("Front page application ID: "
- + frontpageApp.getID() );
- s_log.debug("About to set cat on dedicated front page." );
- Category.setRootForObject(frontpageApp,root);
-
+ s_log.debug("Front page application ID: "
+ + frontpageApp.getID());
+ s_log.debug("About to set cat on dedicated front page.");
+ Category.setRootForObject(frontpageApp, root);
+
}
-
+
// actually create a new subsite
- site = Site.create((String)m_title.getValue(state),
- (String)m_description.getValue(state),
- (String)m_hostname.getValue(state),
+ site = Site.create((String) m_title.getValue(state),
+ (String) m_description.getValue(state),
+ (String) m_hostname.getValue(state),
styleDir,
root,
frontpageApp);
-
+
} else { // (sub)site already exists, modify mutable configuration
-
- site.setTitle((String)m_title.getValue(state));
- site.setDescription((String)m_description.getValue(state));
- site.setHostname((String)m_hostname.getValue(state));
+
+ site.setTitle((String) m_title.getValue(state));
+ site.setDescription((String) m_description.getValue(state));
+ site.setHostname((String) m_hostname.getValue(state));
site.setStyleDirectory(styleDir);
site.setRootCategory(root);
// XXX Check: Frontpage application was not mutable in previous
// version! Check if we explicitly have to handle cat whether
// or not frontpage is shared. See comment above!
site.setFrontPage(frontpageApp);
-
+
}
m_site.clearSelection(state);
-
+
Application app = Application
- .retrieveApplicationForPath("/navigation/");
- Category.setRootForObject(app,
- root,
+ .retrieveApplicationForPath("/navigation/");
+ Category.setRootForObject(app,
+ root,
site.getTemplateContext().getContext());
}
+
}
-
/**
*
*/
private class FrontpageAppListener implements PrintListener {
-
+
public void prepare(PrintEvent e) {
- final SingleSelect target = (SingleSelect)e.getTarget();
+ final SingleSelect target = (SingleSelect) e.getTarget();
// final PageState state = e.getPageState();
- ApplicationCollection customApps ;
+ ApplicationCollection customApps;
// target.addOption(new Option(SELECT_APP, SELECT_APP_LABEL));
target.addOption(new Option(DEFAULT_APP, DEFAULT_APP_LABEL));
-
- String[] customAppTypes = (String[])Subsite.getConfig()
- .getFrontPageApplicationTypes();
- if ( customAppTypes != null) {
- for (int i=0; i < customAppTypes.length; i++) {
+
+ String[] customAppTypes = (String[]) Subsite.getConfig()
+ .getFrontPageApplicationTypes();
+ if (customAppTypes != null) {
+ for (int i = 0; i < customAppTypes.length; i++) {
customApps = Application.retrieveAllApplications(
- customAppTypes[i]);
- while(customApps.next()) {
- /* Create an entry for each application, consisting
- * of the (BigDecimal) ID as value and the URL as
- * label. */
- String appID = customApps.get(ACSObject.ID).toString() ;
- target.addOption( new
- Option(appID ,
- ( customApps.getPrimaryURL()
- +"("+appID+")") ));
- }
+ customAppTypes[i]);
+ while (customApps.next()) {
+ /* Create an entry for each application, consisting
+ * of the (BigDecimal) ID as value and the URL as
+ * label. */
+ String appID = customApps.get(ACSObject.ID).toString();
+ target.addOption(new Option(appID,
+ (customApps.getPrimaryURL()
+ + "(" + appID + ")")));
+ }
}
-
+
}
-
+
}
-
+
}
-
-
+
/**
*
*/
private class ThemesListener implements PrintListener {
-
+
public void prepare(PrintEvent e) {
- SingleSelect target = (SingleSelect)e.getTarget();
+ SingleSelect target = (SingleSelect) e.getTarget();
PageState state = e.getPageState();
Map themes = Subsite.getConfig().getThemes();
Set entrySet = themes.entrySet();
@@ -523,7 +513,7 @@
if (entrySet != null) {
Iterator entries = entrySet.iterator();
while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry)entries.next();
+ Map.Entry entry = (Map.Entry) entries.next();
target.addOption(new Option(entry.getKey().toString(),
entry.getValue().toString()),
state);
@@ -531,6 +521,6 @@
}
target.addOption(new Option(OTHER_STYLE, OTHER_STYLE_LABEL));
}
-
+
}
}
Added: trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java
===================================================================
--- trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java (rev 0)
+++ trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteGlobalizationUtil.java 2012-12-18 07:59:19 UTC (rev 2418)
@@ -0,0 +1,27 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.arsdigita.subsite.ui;
+
+import com.arsdigita.globalization.GlobalizedMessage;
+
+/**
+ *
+ * @author Jens Pelzetter <je...@jp...>
+ * @version $Id$
+ */
+public class SubsiteGlobalizationUtil {
+
+ public static final String BUNDLE_NAME = "com.arsdigita.subsite.ui.SubsiteResources";
+
+ public static GlobalizedMessage globalize(final String key) {
+ return new GlobalizedMessage(key, BUNDLE_NAME);
+ }
+
+ public static GlobalizedMessage globalize(final String key,
+ final Object[] args) {
+ return new GlobalizedMessage(key, BUNDLE_NAME, args);
+ }
+
+}
Added: trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties
===================================================================
--- trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties (rev 0)
+++ trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources.properties 2012-12-18 07:59:19 UTC (rev 2418)
@@ -0,0 +1,23 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+subsite.ui.title.hint=Enter the title of the subsite, upto 80 characters
+subsite.ui.title.label=Title
+subsite.ui.hostname.hint=Enter the hostname for the subsite, eg business.example.com
+subsite.ui.hostname.label=Hostname
+subsite.ui.description.hint=Enter a short description for the subsite, up to 4000 characters
+subsite.ui.description.label=Description
+subsite.ui.customfrontpage.hint=Select the name (url) of the subsite custom homepage
+subsite.ui.customfrontpage.label=Front Page
+subsite.ui.theme.hint=Select an existing theme from the list, select 'Other' to type something below or select 'Site Wide Default' to get the default themes.
+subsite.ui.theme.label=Theme
+subsite.ui.styledir.hint=Enter the directory for the custom XSLT styles, or leave blank for the default styling.
+subsite.ui.styledir.label=Custom XSL directory
+subsite.ui.root_category.hint=Select a root navigation category for the subsite
+subsite.ui.root_category.label=Root category
+subsite.ui.save=Save
+subsite.ui.cancel=Cancel
+subsite.ui.other_style_missing=If you choose {0} for the theme you need to provide a style in the text field
+subsite.ui.other_style_invalid=To set custom XSL directory select {0} in for the theme
+subsite.ui.root_category_missing=No root category selected
+subsite.ui.hostname_already_in\ use=The hostname {0} is already used by another subsite
Added: trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties
===================================================================
--- trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties (rev 0)
+++ trunk/ccm-subsite/src/com/arsdigita/subsite/ui/SubsiteResources_de.properties 2012-12-18 07:59:19 UTC (rev 2418)
@@ -0,0 +1,23 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+subsite.ui.title.hint=Geben Sie den Titel der Subsite ein. Der Titel darf max. 80 Zeichen lang sein.
+subsite.ui.title.label=Titel
+subsite.ui.hostname.hint=Geben Sie den hostname, z.B. business.example.com, ein
+subsite.ui.hostname.label=Hostname
+subsite.ui.description.hint=Geben sie hier eine kurze Beschreibung der Seite ein (max. 4000 Zeichen)
+subsite.ui.description.label=Beschreibung
+subsite.ui.customfrontpage.hint=W\u00e4hlen Sie den Startseite f\u00fcr die Subsite
+subsite.ui.customfrontpage.label=Startseite
+subsite.ui.theme.hint=W\u00e4hlen Sie ein existierendes Theme aus. Um ein anderes Theme im Eingabefeld anzugeben w\u00e4hlen 'Other'. Um das Standard-Theme zu verwenden w\u00e4hlen Sie 'Site-Wide-Default'
+subsite.ui.theme.label=Theme
+subsite.ui.styledir.hint=Geben Sie den Pfad zu einem Verzeichnis mit eigenen XSL-Styles an. Um die Standard-Styles zu verwenden, lassen Sie das Feld leer.
+subsite.ui.styledir.label=Zus\u00e4tzliches XSL Verzeichnis
+subsite.ui.root_category.hint=W\u00e4hlen Sie das Kategoriensystem f\u00fcr die Subsite
+subsite.ui.root_category.label=Kategoriensystem
+subsite.ui.save=Speichern
+subsite.ui.cancel=Abbrechen
+subsite.ui.other_style_missing=Wenn Sie {0} f\u00fcr das Theme w\u00e4hlen, m\u00fcssen Sie im Textfeld ein Theme angeben
+subsite.ui.other_style_invalid=Um ein eigenes Verzeichnis mit XSL-Styles anzugeben, w\u00e4hlen Sie {0} f\u00fcr das Theme
+subsite.ui.root_category_missing=Kein Kategoriensystem ausgew\u00e4hlt
+subsite.ui.hostname_already_in\ use=Der Hostname {0} wird bereits von einer anderen Subsite verwendet
|
|
From: <pb...@fe...> - 2012-12-17 21:30:45
|
Author: pboy Date: 2012-12-17 21:30:36 +0000 (Mon, 17 Dec 2012) New Revision: 2416 Removed: contrib/camden/ccm-ldn-content-check/trunk/ Log: Code reorganized according directory structure convention. |
|
From: <pb...@fe...> - 2012-12-17 21:28:20
|
Author: pboy Date: 2012-12-17 21:28:11 +0000 (Mon, 17 Dec 2012) New Revision: 2415 Added: contrib/camden/ccm-ldn-content-check/application.xml contrib/camden/ccm-ldn-content-check/pdl/ contrib/camden/ccm-ldn-content-check/sql/ contrib/camden/ccm-ldn-content-check/src/ contrib/camden/ccm-ldn-content-check/web/ Removed: contrib/camden/ccm-ldn-content-check/trunk/application.xml contrib/camden/ccm-ldn-content-check/trunk/pdl/ contrib/camden/ccm-ldn-content-check/trunk/sql/ contrib/camden/ccm-ldn-content-check/trunk/src/ contrib/camden/ccm-ldn-content-check/trunk/web/ Log: Code reorganized according directory structure convention. Copied: contrib/camden/ccm-ldn-content-check/application.xml (from rev 2414, contrib/camden/ccm-ldn-content-check/trunk/application.xml) =================================================================== --- contrib/camden/ccm-ldn-content-check/application.xml (rev 0) +++ contrib/camden/ccm-ldn-content-check/application.xml 2012-12-17 21:28:11 UTC (rev 2415) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<ccm:application name="ccm-ldn-content-check" + prettyName="Content Check Alerts" + version="1.0.1" + release="2" + webapp="ROOT" + xmlns:ccm="http://ccm.redhat.com/ccm-project"> + + <ccm:dependencies> + <ccm:requires name="ccm-ldn-dublin" version="1.4.3" relation="ge"/> + </ccm:dependencies> + + <ccm:contacts> + <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> + <ccm:contact uri="mailto:rh...@re..." type="support"/> + </ccm:contacts> + + <ccm:description> + Content Check Alerts checks periodically for outdated content items + and send email alerts to Content Owners. + </ccm:description> + +</ccm:application> Deleted: contrib/camden/ccm-ldn-content-check/trunk/application.xml =================================================================== --- contrib/camden/ccm-ldn-content-check/trunk/application.xml 2012-12-17 16:49:14 UTC (rev 2414) +++ contrib/camden/ccm-ldn-content-check/trunk/application.xml 2012-12-17 21:28:11 UTC (rev 2415) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<ccm:application name="ccm-ldn-content-check" - prettyName="Content Check Alerts" - version="1.0.1" - release="2" - webapp="ROOT" - xmlns:ccm="http://ccm.redhat.com/ccm-project"> - - <ccm:dependencies> - <ccm:requires name="ccm-ldn-dublin" version="1.4.3" relation="ge"/> - </ccm:dependencies> - - <ccm:contacts> - <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> - <ccm:contact uri="mailto:rh...@re..." type="support"/> - </ccm:contacts> - - <ccm:description> - Content Check Alerts checks periodically for outdated content items - and send email alerts to Content Owners. - </ccm:description> - -</ccm:application> |
18 messages has been excluded from this view by a project administrator.
