Anpassung ccm-ldn-atoz etc an Änderungen für forum-categorised.

git-svn-id: https://svn.libreccm.org/ccm/trunk@462 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2010-06-13 08:13:48 +00:00
parent 1fc80f014b
commit 648bf44120
3 changed files with 89 additions and 12 deletions

View File

@ -10,10 +10,12 @@
<ccm:requires name="ccm-core" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/> <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
</ccm:dependencies> </ccm:dependencies>
<ccm:contacts> <ccm:contacts>
<ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
<ccm:contact uri="mailto:rhea@redhat.com" type="support"/> <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
</ccm:contacts> </ccm:contacts>
<ccm:description> <ccm:description>
A threadded forum application for online discussions using the Red Hat A threadded forum application for online discussions using the Red Hat
Web Application Framework. Web Application Framework.
@ -21,4 +23,5 @@
The Red Hat Web Application Framework is a platform for writing The Red Hat Web Application Framework is a platform for writing
database-backed web applications in Java. database-backed web applications in Java.
</ccm:description> </ccm:description>
</ccm:application> </ccm:application>

View File

@ -24,40 +24,43 @@ import com.arsdigita.london.atoz.AtoZCategoryProvider;
import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Domain;
import com.arsdigita.london.terms.Term; import com.arsdigita.london.terms.Term;
import com.arsdigita.aplaws.Aplaws; // import com.arsdigita.aplaws.Aplaws;
import com.arsdigita.bebop.form.Widget; // import com.arsdigita.bebop.form.Widget;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.ArrayParameter; // import com.arsdigita.bebop.parameters.ArrayParameter;
import com.arsdigita.bebop.parameters.StringParameter; // import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.BigDecimalParameter; // import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.categorization.Category; import com.arsdigita.categorization.Category;
import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainCollection;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.london.terms.Terms;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import com.arsdigita.xml.XML; // import com.arsdigita.xml.XML;
import com.arsdigita.cms.CMS; import com.arsdigita.cms.CMS;
import com.arsdigita.cms.ContentSection; // import com.arsdigita.cms.ContentSection;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.HashMap; // import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; // import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Copied from com.arsdigita.aplaws.ui.TermWidget. * Copied from com.arsdigita.aplaws.ui.TermWidget.
* ( com.arsdigita.aplaws.ui.TermWidget relocated to
* com.arsdigita.london.terms.ui.TermWidget )
* *
* @author clasohm@redhat.com * @author clasohm@redhat.com
*/ */
public class TermWidget extends com.arsdigita.aplaws.ui.TermWidget { public class TermWidget extends com.arsdigita.london.terms.ui.TermWidget {
private static final Logger s_log = Logger.getLogger(TermWidget.class); private static final Logger s_log = Logger.getLogger(TermWidget.class);
private ACSObjectSelectionModel m_provider; private ACSObjectSelectionModel m_provider;
@ -68,6 +71,7 @@ public class TermWidget extends com.arsdigita.aplaws.ui.TermWidget {
m_provider = provider; m_provider = provider;
} }
@Override
protected void generateWidget(PageState state, protected void generateWidget(PageState state,
Element parent) { Element parent) {
Domain domain = getDomain(state); Domain domain = getDomain(state);
@ -115,7 +119,7 @@ public class TermWidget extends com.arsdigita.aplaws.ui.TermWidget {
Element el = generateCategory(widget, domain.getModel(), ids, null); Element el = generateCategory(widget, domain.getModel(), ids, null);
if (Aplaws.getAplawsConfig().ajaxExpandAllBranches()) { if (Terms.getConfig().ajaxExpandAllBranches()) {
// add attribute to the parent node, so that in stylesheet // add attribute to the parent node, so that in stylesheet
// we can look for any ancestor with this attribute (can't // we can look for any ancestor with this attribute (can't
// add attribute to categoryWidget element as that is not // add attribute to categoryWidget element as that is not

View File

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- project.xml - (ldn)devel - containing those modules as of aplaws 1.0.5
which are part of ccm-ldn-aplaws devel bundle
To be synchronized with ccm-ldn-aplaws/bundle/devel/cfg/applications.cfg -->
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1"
name="aplaws"
prettyName="APLAWS plus (devel)"
version="1-1-0"
release="rc-3"
webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
<ccm:databases>
<ccm:database name="postgres"/>
</ccm:databases>
<ccm:build>
<!-- Main apps -->
<ccm:application name="ccm-core"/>
<ccm:application name="ccm-cms"/>
<!-- Content assets -->
<ccm:application name="ccm-cms-assets-relatedlink"/>
<ccm:application name="ccm-ldn-dublin"/>
<!-- Content types -->
<ccm:application name="ccm-cms-types-article"/>
<ccm:application name="ccm-cms-types-contact"/>
<!-- <ccm:application name="ccm-cms-types-esdservice"/> -->
<ccm:application name="ccm-cms-types-filestorageitem"/>
<ccm:application name="ccm-cms-types-formitem"/>
<ccm:application name="ccm-cms-types-formsectionitem"/>
<ccm:application name="ccm-cms-types-inlinesite"/>
<ccm:application name="ccm-cms-types-mparticle"/>
<ccm:application name="ccm-cms-types-newsitem"/>
<ccm:application name="ccm-cms-types-pressrelease"/>
<ccm:application name="ccm-cms-types-siteproxy"/>
<ccm:application name="ccm-cms-types-xmlfeed"/>
<!-- Applications -->
<ccm:application name="ccm-ldn-aplaws"/>
<ccm:application name="ccm-ldn-atoz"/>
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-portal"/>
<ccm:application name="ccm-ldn-rss"/>
<ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/>
<ccm:application name="ccm-ldn-terms"/>
<ccm:application name="ccm-ldn-util"/>
<!-- Extra apps -->
<ccm:application name="ccm-forum"/>
<ccm:application name="ccm-ldn-importer"/>
<ccm:application name="ccm-ldn-theme"/>
<!-- tools will be downloaded from trunk, but does not
contain java code to be compiled!
<ccm:application name="tools"/> -->
</ccm:build>
</ccm:project>