LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Changed name of default content section from "main" to "info" (ticket #1606) 

* Removed class StackTraces from developer support (not useful anymore but causes probs in production)



git-svn-id: https://svn.libreccm.org/ccm/trunk@2514 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2014-02-09 09:42:17 +00:00
parent a4e3c23b55
commit e87d1fb2dc
8 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-bundle/src/com/arsdigita/bundle/Loader.java
View File

@ -115,7 +115,7 @@ public class Loader extends PackageLoader {
private Parameter m_domainMappings = new StringArrayParameter(
"com.arsdigita.bundle.loader.domain_mappings",
Parameter.REQUIRED,new String[]{ "STD-NAV:/navigation/",
"STD-NAV:/main/",
"STD-NAV:/info/",
"STD-NAV:/portal/" }
);

18
ccm-cms/src/com/arsdigita/cms/Loader.java
View File

@ -90,16 +90,30 @@ public class Loader extends PackageLoader {
// ///////////////////////////////////////////////////////////////////
// Configurable parameters during load step.
// ///////////////////////////////////////////////////////////////////
/**
* The name(s) of the content section(s). In case of more than one name the
* first is treated as default section. Otherwise the section created is the
* default section. More sections can always be created during a subsequent
* system startup using initialization parameters.
* system startup using initialization parameters or using the
* content section GUI.
*
* If you change the default value below you have to adjust the appropriate
* bundle loader's default domain mapping as well!
*/
/* NON Javadoc comment:
* Criteria for the name of the standard content section:
* - the wording should be meaningful in several languages (no specific
* english term)
* - should be non-trivial (like "content")
* Candidates:
* - info
* - public / publ
*/
private final Parameter m_contentSectionNames = new StringArrayParameter(
"com.arsdigita.cms.loader.section_names",
Parameter.REQUIRED,
new String[]{"main"});
new String[]{"info"});
// ///////////////////////////////////////////////////////////////////
// Configurable parameters during load step END.
// ///////////////////////////////////////////////////////////////////

3
ccm-cms/src/com/arsdigita/cms/LoaderConfig.java
View File

@ -234,7 +234,8 @@ public final class LoaderConfig extends AbstractConfig {
* categories from file(s) specified in the next parameter (
* m_categoryFileList )
*/
private final Parameter m_useSectionCategories = new BooleanParameter("com.arsdigita.cms.loader.use_section_categories",
private final Parameter m_useSectionCategories = new BooleanParameter(
"com.arsdigita.cms.loader.use_section_categories",
Parameter.REQUIRED, new Boolean(false));
/**
* XML file containing the category tree to load for this content section.

13
ccm-core/src/com/arsdigita/bebop/Completable.java
View File

@ -22,7 +22,11 @@ import com.arsdigita.util.Assert;
import com.arsdigita.bebop.event.ActionEvent;
import com.arsdigita.bebop.event.ActionListener;
import com.arsdigita.developersupport.StackTraces;
// Stacktraces is a support tool to use in a specifically difficult development
// situation. It is abundant in production and for normal development work and
// it provved to have funny side effects in a production environment. So it is
// commented out here but kept for further references.
// import com.arsdigita.developersupport.StackTraces;
import java.util.ArrayList;
import java.util.Iterator;
@ -44,9 +48,10 @@ public abstract class Completable implements Component {
private ArrayList m_completionListeners = new ArrayList();
public Completable() {
if ( s_log.isDebugEnabled() ) {
StackTraces.captureStackTrace(this);
}
// See note above!
// if ( s_log.isDebugEnabled() ) {
// StackTraces.captureStackTrace(this);
// }
}
public void addCompletionListener(ActionListener listener) {

5
ccm-core/src/com/arsdigita/developersupport/StackTraces.java → ccm-core/src/com/arsdigita/developersupport/StackTraces.java.nolongerInUse
View File

@ -26,6 +26,11 @@ import java.util.Map;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
// Note:
// Stacktraces is a support tool to use in a specifically difficult development
// situation. It is abundant in production and for normal development work and
// it proved to have funny side effects in a production environment. So it is
// commented out here but kept for further references.
/**
* This class facilitates debugging by allowing you to capture a stack trace for

9
ccm-core/src/com/arsdigita/toolbox/ui/ModalPanel.java
View File

@ -39,7 +39,11 @@ import com.arsdigita.bebop.event.TableActionEvent;
import com.arsdigita.bebop.form.Widget;
import com.arsdigita.bebop.parameters.ArrayParameter;
import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.developersupport.StackTraces;
// Stacktraces is a support tool to use in a specifically difficult development
// situation. It is abundant in production and for normal development work and
// it provved to have funny side effects in a production environment. So it is
// commented out here but kept for further references.
// import com.arsdigita.developersupport.StackTraces;
import com.arsdigita.util.Assert;
import com.arsdigita.xml.Element;
import java.util.Iterator;
@ -383,7 +387,8 @@ public class ModalPanel extends ComponentMap {
s_log.warn("Form " + form + " does not " +
"implement Cancellable.");
StackTraces.log("The form was created at", form, s_log, "warn");
// See note above (import statement)!!
// StackTraces.log("The form was created at", form, s_log, "warn");
}
}

10
ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
View File

@ -243,21 +243,21 @@ public class Loader extends PackageLoader {
String rssKey = (String)get(m_rssDomain);
registerDomain(navigationKey, "/navigation/", null);
registerDomain(navigationKey, "/main/", null);
registerDomain(navigationKey, "/info/", null);
registerDomain(navigationKey, "/portal/", null);
//registerDomain(navigationKey, "/atoz/", null);
//registerDomain(navigationKey, "/admin/subsite/", null);
registerDomain(subjectKey, "/search/", null);
registerDomain(subjectKey, "/main/", "subject");
registerDomain(subjectKey, "/info/", "subject");
registerDomain(servicesKey, "/services/", null);
registerDomain(servicesKey, "/main/", "services");
registerDomain(servicesKey, "/info/", "services");
registerDomain(rssKey, "/channels/", null);
registerDomain(rssKey, "/main/", "rss");
registerDomain(rssKey, "/info/", "rss");
registerDomain(interactionKey, "/main/", "interaction");
registerDomain(interactionKey, "/info/", "interaction");
registerServicesTemplate("/services/");
registerPortalTemplate();

7
ccm-sci-bundle/src/com/arsdigita/bundle/Loader.java
View File

@ -61,9 +61,11 @@ public class Loader extends PackageLoader {
/** Logger instance for debugging */
private static final Logger s_log = Logger.getLogger(Loader.class);
// /////////////////////////////////////////////////////////////////////////////
// Parameter Section
// /////////////////////////////////////////////////////////////////////////////
/**
* List of comma separated sets of application instance specifications,
* optionally used to create arbitrary custom application instances
@ -112,13 +114,14 @@ public class Loader extends PackageLoader {
private Parameter m_domainMappings = new StringArrayParameter(
"com.arsdigita.bundle.loader.domain_mappings",
Parameter.REQUIRED, new String[]{"STD-NAV:/navigation/",
"STD-NAV:/main/",
"STD-NAV:/info/",
"STD-NAV:/portal/"});
/**
* Database Drive Enum data to load.
*/
private Parameter m_ddenums = new StringArrayParameter("com.arsdigita.bundle.loader.ddenums",
private Parameter m_ddenums = new StringArrayParameter(
"com.arsdigita.bundle.loader.ddenums",
Parameter.REQUIRED,
new String[]{"bundle/ddenums.xml"});