From 648bf441203155cdb340e46e24d97d12c17240a8 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 13 Jun 2010 08:13:48 +0000
Subject: [PATCH] =?UTF-8?q?Anpassung=20ccm-ldn-atoz=20etc=20an=20=C3=84nde?=
 =?UTF-8?q?rungen=20f=C3=BCr=20forum-categorised.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@462 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-forum/application.xml                     |  3 +
 .../london/atoz/ui/admin/TermWidget.java      | 28 ++++----
 environment/project.xml.ldn-devel             | 70 +++++++++++++++++++
 3 files changed, 89 insertions(+), 12 deletions(-)
 create mode 100755 environment/project.xml.ldn-devel

diff --git a/ccm-forum/application.xml b/ccm-forum/application.xml
index 48d8959f0..a50977ccc 100755
--- a/ccm-forum/application.xml
+++ b/ccm-forum/application.xml
@@ -10,10 +10,12 @@
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>    
     <ccm:requires name="ccm-cms"  version="6.6.0" relation="ge"/>
   </ccm:dependencies>
+
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
+
   <ccm:description>
     A threadded forum application for online discussions using the Red Hat 
     Web Application Framework.
@@ -21,4 +23,5 @@
     The Red Hat Web Application Framework is a platform for writing
     database-backed web applications in Java.
   </ccm:description>
+  
 </ccm:application>
diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java
index baa7f1bed..a5cc2ff05 100644
--- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java
+++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/admin/TermWidget.java
@@ -24,40 +24,43 @@ import com.arsdigita.london.atoz.AtoZCategoryProvider;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.Term;
 
-import com.arsdigita.aplaws.Aplaws;
-import com.arsdigita.bebop.form.Widget;
+// import com.arsdigita.aplaws.Aplaws;
+// import com.arsdigita.bebop.form.Widget;
 import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.parameters.ArrayParameter;
-import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.bebop.parameters.BigDecimalParameter;
+// import com.arsdigita.bebop.parameters.ArrayParameter;
+// import com.arsdigita.bebop.parameters.StringParameter;
+// import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.domain.DomainCollection;
 import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.london.terms.Terms;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.xml.Element;
-import com.arsdigita.xml.XML;
+// import com.arsdigita.xml.XML;
 
 import com.arsdigita.cms.CMS;
-import com.arsdigita.cms.ContentSection;
+// import com.arsdigita.cms.ContentSection;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
+// import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
+// import java.util.Map;
 import java.util.Set;
 
 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
  */
-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 ACSObjectSelectionModel m_provider;
@@ -68,6 +71,7 @@ public class TermWidget extends com.arsdigita.aplaws.ui.TermWidget {
 		m_provider = provider;
 	}
     
+    @Override
     protected void generateWidget(PageState state,
                                   Element parent) {
         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);
         
-        if (Aplaws.getAplawsConfig().ajaxExpandAllBranches()) {
+        if (Terms.getConfig().ajaxExpandAllBranches()) {
         	// add attribute to the parent node, so that in stylesheet 
         	// we can look for any ancestor with this attribute (can't 
         	// add attribute to categoryWidget element as that is not 
diff --git a/environment/project.xml.ldn-devel b/environment/project.xml.ldn-devel
new file mode 100755
index 000000000..e796875ba
--- /dev/null
+++ b/environment/project.xml.ldn-devel
@@ -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>