diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java index 71577113a..df21b94ca 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java @@ -53,7 +53,7 @@ import org.apache.log4j.Logger; * @author Tri Tran * @author David Lutterkort * - * @version $Id: FolderTreeModelBuilder.java 1940 2009-05-29 07:15:05Z terry $ + * @version $Id: FolderTreeModelBuilder.java 2183 2011-06-20 00:57:18Z pboy $ */ public class FolderTreeModelBuilder extends LockableImpl implements TreeModelBuilder { diff --git a/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java b/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java index 4d63f846a..4a078dcee 100755 --- a/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java +++ b/ccm-core/src/com/arsdigita/metadata/DynamicObjectType.java @@ -890,6 +890,7 @@ public class DynamicObjectType extends DynamicElement { /** * This prints out a String representation of this object type */ + @Override public String toString() { String appendString = Utilities.LINE_BREAK + "The following will be " + "added to the table:" + makeTableDDL(); diff --git a/ccm-core/src/com/arsdigita/packaging/Loader.java b/ccm-core/src/com/arsdigita/packaging/Loader.java index 380bced4d..ea99fc000 100755 --- a/ccm-core/src/com/arsdigita/packaging/Loader.java +++ b/ccm-core/src/com/arsdigita/packaging/Loader.java @@ -55,7 +55,7 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #13 $ $Date: 2004/08/16 $ - * @version $Id: Loader.java 736 2005-09-01 10:46:05Z sskracic $ + * @version $Id: Loader.java 2115 2011-01-13 17:11:50Z pboy $ **/ class Loader { diff --git a/ccm-core/src/com/arsdigita/templating/XSLTemplate.java b/ccm-core/src/com/arsdigita/templating/XSLTemplate.java index 5e6d619fc..74d3954fc 100755 --- a/ccm-core/src/com/arsdigita/templating/XSLTemplate.java +++ b/ccm-core/src/com/arsdigita/templating/XSLTemplate.java @@ -54,14 +54,10 @@ import org.w3c.dom.Document; * and transformers. * * @author Dan Berrange - * @version $Id: XSLTemplate.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: XSLTemplate.java 1942 2009-05-29 07:53:23Z terry $ */ public final class XSLTemplate { - public static final String versionId = - "$Id: XSLTemplate.java 287 2005-02-22 00:29:02Z sskracic $" - + "$Author: sskracic $" - + "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(XSLTemplate.class); private final URL m_source; private final Templates m_templates; diff --git a/ccm-core/src/com/arsdigita/xml/XMLConfig.java b/ccm-core/src/com/arsdigita/xml/XMLConfig.java index 7738924dc..c596f2c08 100755 --- a/ccm-core/src/com/arsdigita/xml/XMLConfig.java +++ b/ccm-core/src/com/arsdigita/xml/XMLConfig.java @@ -33,13 +33,10 @@ import org.apache.log4j.Logger; * - Sax Parser * - XSL Transformer * + * @version $Id: XMLConfig.java 1393 2006-11-28 09:12:32Z sskracic $ */ public final class XMLConfig extends AbstractConfig { - public final static String versionId = - "$Id: XMLConfig.java 1393 2006-11-28 09:12:32Z sskracic $" - + "$Author: sskracic $" - + "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(XMLConfig.class); private static XMLConfig s_config; // supported XSL transformer implementations diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index c218881ec..3807a7e97 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -21,8 +21,8 @@ package com.arsdigita.aplaws; import com.arsdigita.london.navigation.Template; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.importer.Parser; -import com.arsdigita.portalworkspace.PageLayout; -import com.arsdigita.portalworkspace.Workspace; +// import com.arsdigita.portalworkspace.PageLayout; +// import com.arsdigita.portalworkspace.Workspace; import com.arsdigita.categorization.Category; import com.arsdigita.categorization.RootCategoryCollection; @@ -188,10 +188,10 @@ public class Loader extends PackageLoader { // at url /portal/. Portal pages at other urls use the corresponding // configuration parameter for its initial value and number of columns // may be modified at any time using configuration ui. -/* Workspace portal = (Workspace)Application - .retrieveApplicationForPath("/portal/"); - portal.setDefaultLayout(PageLayout - .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN)); */ + // Workspace portal = (Workspace)Application + // .retrieveApplicationForPath("/portal/"); + // portal.setDefaultLayout(PageLayout + // .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN)); } // end run method // public void registerServicesTemplate(String appURL) { diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java index 66d860d7a..0181ea8d9 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -42,8 +42,8 @@ import com.arsdigita.london.navigation.Template; import com.arsdigita.london.navigation.TemplateMapping; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.importer.Parser; -import com.arsdigita.portalworkspace.PageLayout; -import com.arsdigita.portalworkspace.Workspace; +// import com.arsdigita.portalworkspace.PageLayout; +// import com.arsdigita.portalworkspace.Workspace; import java.net.URL; import java.net.MalformedURLException; diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AddNavigation.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AddNavigation.java index 0a010c3e2..f4fba9b0b 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AddNavigation.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/AddNavigation.java @@ -31,7 +31,8 @@ public class AddNavigation extends Program { return new Navigation(dataObject); } }); - Application app = Application.createApplication( + /* Create Instance beyond root (4. parameter null) */ + Application app = Application.createApplication( Navigation.BASE_DATA_OBJECT_TYPE, navURL, navTitle, null); app.save(); Domain domain = Domain.retrieve(defaultDomain); diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CustomizableObjectList.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CustomizableObjectList.java index 4b1b61ff4..1d42b91c8 100644 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CustomizableObjectList.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/object/CustomizableObjectList.java @@ -51,27 +51,27 @@ import org.apache.log4j.Logger; * {@code * ... * + classname="com.arsdigita.london.navigation.ui.object.CustomizableObjectList"/> * ... * -CustomizableObjectList objList = (CustomizableObjectList) itemList; -objList.setDefinition(new CMSDataCollectionDefinition()); -objList.setRenderer(new CMSDataCollectionRenderer()); -objList.getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication"); -objList.getDefinition().setDescendCategories(false); -objList.addTextFilter("title", "title"); -objList.addTextFilter("authors.surname", "author"); -objList.addSelectFilter("yearOfPublication", "year", true, true, true, true); -objList.addSortField("title", "title asc"); -objList.addSortField("yearAsc", "yearOfPublication asc"); -objList.addSortField("yearDesc", "yearOfPublication desc"); -objList.addSortField("authors", "authors.surname asc, authors.givenname asc"); -objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort"))); + CustomizableObjectList objList = (CustomizableObjectList) itemList; + objList.setDefinition(new CMSDataCollectionDefinition()); + objList.setRenderer(new CMSDataCollectionRenderer()); + objList.getDefinition().setObjectType("com.arsdigita.cms.contenttypes.Publication"); + objList.getDefinition().setDescendCategories(false); + objList.addTextFilter("title", "title"); + objList.addTextFilter("authors.surname", "author"); + objList.addSelectFilter("yearOfPublication", "year", true, true, true, true); + objList.addSortField("title", "title asc"); + objList.addSortField("yearAsc", "yearOfPublication asc"); + objList.addSortField("yearDesc", "yearOfPublication desc"); + objList.addSortField("authors", "authors.surname asc, authors.givenname asc"); + objList.getDefinition().addOrder(objList.getOrder(request.getParameter("sort"))); -objList.getRenderer().setPageSize(20); -objList.getRenderer().setSpecializeObjects(true); + objList.getRenderer().setPageSize(20); + objList.getRenderer().setSpecializeObjects(true); - + * ... * } * diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml index 0a9c6e987..055d9d19f 100644 --- a/tools-ng/netbeans/project.xml +++ b/tools-ng/netbeans/project.xml @@ -794,7 +794,7 @@ ccm-shp-aplaws/web ccm-zes-aplaws/src ccm-zes-aplaws/web - ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/PDFBox-0.7.2-log4j.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:tools-ng/devel/lib/ccm-servlet-2.3.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/postgresql-jdbc.jar + ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:tools-ng/devel/lib/ccm-servlet-2.3.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/postgresql-jdbc.jar 1.5