Synchronized core with APLAWS repository (r 2675 / part 1).

git-svn-id: https://svn.libreccm.org/ccm/trunk@2488 8810af33-2d31-482b-a856-94f89814c4df

ccm-bundle/bundles/devel/cfg/project.xml

@@ -44,7 +44,6 @@
         <ccm:application name="ccm-navigation"/>
         <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-shortcuts"/>
         <ccm:application name="ccm-subsite"/>                    
 
@@ -74,18 +73,19 @@
 
 <!--   Content Types   -->
         <ccm:application name="ccm-cms-types-bookmark"/>
-<!--
         <ccm:application name="ccm-cms-types-event"/>
         <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
+<!--
 -->
         <ccm:application name="ccm-cms-types-newsitem"/>
-<!--
         <ccm:application name="ccm-cms-types-person"/>
+<!--
 -->
 <!--   Applications   -->
 <!--
         <ccm:application name="ccm-cms-publicpersonalprofile"/>
+        <ccm:application name="ccm-portalworkspace-homepage"/>
 -->
 
 <!--   LDN extension  -->
@@ -100,10 +100,10 @@
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--  CMS Content Types  -->
-<!--    
         <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-agenda"/>
         <ccm:application name="ccm-cms-types-contact"/>
+<!--    
         <ccm:application name="ccm-cms-types-faqitem"/>
         <ccm:application name="ccm-cms-types-glossaryitem"/>
         <ccm:application name="ccm-cms-types-htmlform"/>
@@ -143,8 +143,10 @@
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Libre CMS   modules under development                                -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--
         <ccm:application name="ccm-portlet-bookmarks"/>
         <ccm:application name="ccm-portlet-latestnews"/>
+-->
 
 
 

ccm-core/src/com/arsdigita/bebop/Completable.java

@@ -41,14 +41,14 @@ public abstract class Completable implements Component {
 
     private final static Logger s_log = Logger.getLogger(Completable.class);
 
+    private ArrayList m_completionListeners = new ArrayList();
+
     public Completable() {
         if ( s_log.isDebugEnabled() ) {
             StackTraces.captureStackTrace(this);
         }
     }
 
-    private ArrayList m_completionListeners = new ArrayList();
-
     public void addCompletionListener(ActionListener listener) {
         Assert.isUnlocked(this);
         m_completionListeners.add(listener);

ccm-core/src/com/arsdigita/kernel/DatabaseTransaction.java

@@ -28,10 +28,6 @@ import org.apache.log4j.Logger;
  * @author Justin Ross
  */
 public final class DatabaseTransaction {
-    public static final String versionId =
-        "$Id: DatabaseTransaction.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
         (DatabaseTransaction.class);

ccm-core/src/com/arsdigita/kernel/EmailAddress.java

@@ -47,12 +47,9 @@ import com.arsdigita.persistence.DataObject;
  *
  * @author Oumi Mehrotra
  * @version $Id: EmailAddress.java 738 2005-09-01 12:36:52Z sskracic $
- **/
+ */
-
 public class EmailAddress {
 
-    public static final String versionId = "$Id: EmailAddress.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
     private String m_emailAddress;
     private EmailAddressRecord m_emailRecord;
 

ccm-core/src/com/arsdigita/kernel/GroupCollection.java

@@ -25,12 +25,8 @@ import com.arsdigita.persistence.DataCollection;
  *
  * @author Phong Nguyen
  * @version 1.0
- **/
+ */
 public class GroupCollection extends PartyCollection {
-    public static final String versionId = 
-        "$Id: GroupCollection.java 287 2005-02-22 00:29:02Z sskracic $" +
-        "$Author: sskracic $" +
-        "$DateTime: 2004/08/16 18:10:38 $";
 
     /**
      * Constructor.

ccm-core/src/com/arsdigita/kernel/HashPasswords.java

@@ -24,7 +24,6 @@ import org.apache.log4j.Logger;
 
 public class HashPasswords {
 
-    public static final String versionId = "$Id: HashPasswords.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private static final Logger s_log =
         Logger.getLogger(HashPasswords.class);
 

ccm-core/src/com/arsdigita/kernel/KernelDispatcherServlet.java

@@ -36,9 +36,6 @@ import org.apache.log4j.Logger;
  */
 public abstract class KernelDispatcherServlet extends BaseDispatcherServlet {
 
-    public static final String versionId =
-        "$Id: KernelDispatcherServlet.java 287 2005-02-22 00:29:02Z sskracic $";
-
     private static final Logger s_cat =
         Logger.getLogger(KernelDispatcherServlet.class.getName());
 

ccm-core/src/com/arsdigita/kernel/KernelException.java

@@ -26,9 +26,6 @@ package com.arsdigita.kernel;
  */
 public class KernelException extends Exception {
 
-    public static final String versionId = "$Id: KernelException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
-
     public KernelException() {
         super();
     }

ccm-core/src/com/arsdigita/kernel/NoValidURLException.java

@@ -26,9 +26,6 @@ package com.arsdigita.kernel;
  */
 public class NoValidURLException extends URLServiceException {
 
-    public static final String versionId = "$Id: NoValidURLException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
-
     public NoValidURLException() {
         super();
     }

ccm-core/src/com/arsdigita/kernel/PartyCollection.java

@@ -29,8 +29,6 @@ import com.arsdigita.persistence.Filter;
  **/
 public class PartyCollection extends ACSObjectCollection {
 
-    public static final String versionId = "$Id: PartyCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
     /**
      * Constructor.
      *

ccm-core/src/com/arsdigita/kernel/PersonName.java

@@ -42,8 +42,6 @@ import org.apache.log4j.Logger;
  **/
 public class PersonName extends DomainObject {
 
-    public static final String versionId = "$Id: PersonName.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
     private static final String m_baseDataObjectType =
         "com.arsdigita.kernel.PersonName";
 

ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java

@@ -42,7 +42,7 @@ import org.apache.log4j.Logger;
  * @see ResourceConfigFormSection
  * @see com.arsdigita.kernel.Resource
  * @author Justin Ross
- * @version $Id: ResourceTypeConfig.java 1270 2006-07-18 13:34:55Z cgyg9330 $
+ * @version $Id: ResourceTypeConfig.java 1942 2009-05-29 07:53:23Z terry $
  */
 public class ResourceTypeConfig {
 

ccm-core/src/com/arsdigita/kernel/RoleCollection.java

@@ -29,11 +29,9 @@ import com.arsdigita.persistence.DataCollection;
  *
  * @author Michael Bryzek 
  * @version 1.0
- **/
+ */
 public class RoleCollection extends DomainCollection {
 
-    public static final String versionId = "$Id: RoleCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
     /**
      * Constructor.
      *

ccm-core/src/com/arsdigita/kernel/URLFinderNotFoundException.java

@@ -26,9 +26,6 @@ package com.arsdigita.kernel;
  */
 public class URLFinderNotFoundException extends URLServiceException {
 
-    public static final String versionId = "$Id: URLFinderNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
-
     public URLFinderNotFoundException() {
         super();
     }

ccm-core/src/com/arsdigita/kernel/URLServiceException.java

@@ -26,9 +26,6 @@ package com.arsdigita.kernel;
  */
 public class URLServiceException extends RuntimeException {
 
-    public static final String versionId = "$Id: URLServiceException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
-
     public URLServiceException() {
         super();
     }

ccm-core/src/com/arsdigita/kernel/permissions/UniversalPermissionDescriptor.java

@@ -31,11 +31,10 @@ import com.arsdigita.persistence.OID;
  * @see com.arsdigita.kernel.permissions.PermissionDescriptor
  * @see com.arsdigita.kernel.permissions.PrivilegeDescriptor
  * @see com.arsdigita.kernel.permissions.PermissionService
- **/
+ * @version $Id: UniversalPermissionDescriptor.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class UniversalPermissionDescriptor extends PermissionDescriptor {
 
-    public static final String versionId = "$Id: UniversalPermissionDescriptor.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
     static final OID ROOT_CONTEXT_OID =
         new OID("com.arsdigita.kernel.ACSObject", 0);
 

ccm-core/src/com/arsdigita/kernel/security/HTTPRequestCallback.java

@@ -25,10 +25,10 @@ import javax.servlet.http.HttpServletRequest;
  * Callback to retrieve the current <code>HttpServletRequest</code>.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: HTTPRequestCallback.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class HTTPRequestCallback implements Callback {
 
-    public static final String versionId = "$Id: HTTPRequestCallback.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private HttpServletRequest m_request;
 
     /**

ccm-core/src/com/arsdigita/kernel/security/HTTPResponseCallback.java

@@ -25,10 +25,10 @@ import javax.servlet.http.HttpServletResponse;
  * Callback to retrieve the current <code>HttpServletResponse</code>.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: HTTPResponseCallback.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class HTTPResponseCallback implements Callback {
 
-    public static final String versionId = "$Id: HTTPResponseCallback.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private HttpServletResponse m_response;
 
     /**

ccm-core/src/com/arsdigita/kernel/security/LifetimeCallback.java

@@ -28,7 +28,6 @@ import javax.security.auth.callback.Callback;
  **/
 public class LifetimeCallback implements Callback {
 
-    public static final String versionId = "$Id: LifetimeCallback.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private boolean m_forever;
 
     /**

ccm-core/src/com/arsdigita/kernel/security/MappingLoginModule.java

@@ -34,10 +34,9 @@ import org.apache.log4j.Logger;
  * PasswordLoginModule.
  *
  * @author Sameer Ajmani
- **/
+ */
 public abstract class MappingLoginModule implements LoginModule {
 
-    public static final String versionId = "$Id: MappingLoginModule.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private static final Logger s_log =
         Logger.getLogger(MappingLoginModule.class.getName());
 

ccm-core/src/com/arsdigita/kernel/security/ParanoidSecurityHelper.java

@@ -29,15 +29,14 @@ import javax.servlet.http.HttpServletRequest;
  *
  * @author Sameer Ajmani
  * @see SecurityHelper
- **/
+ */
 public class  ParanoidSecurityHelper extends DefaultSecurityHelper {
 
-    public static final String versionId = "$Id: ParanoidSecurityHelper.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     /**
      * Always returns true (to simulate secure conditions).
      *
      * @return <code>true</code>.
-     **/
+     */
     public boolean isSecure(HttpServletRequest req) {
         return true;
     }

ccm-core/src/com/arsdigita/kernel/security/PartyPrincipal.java

@@ -25,14 +25,13 @@ import java.security.Principal;
  * A Principal that stores a numeric ID, such as a party ID.
  *
  * @author Sameer Ajmani
- **/
+ */
 public class PartyPrincipal implements Principal {
 
-    public static final String versionId = "$Id: PartyPrincipal.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private BigDecimal m_id;
     /**
      * Creates a new PartyPrincipal that stores the given ID.
-     **/
+     */
     public PartyPrincipal(BigDecimal id) {
         m_id = id;
     }
@@ -40,7 +39,7 @@ public class PartyPrincipal implements Principal {
      * Returns the stored ID.
      *
      * @return the stored ID.
-     **/
+     */
     public BigDecimal getID() {
         return m_id;
     }
@@ -48,7 +47,7 @@ public class PartyPrincipal implements Principal {
      * Returns the ID number as a string.
      *
      * @return the ID number as a string.
-     **/
+     */
     public String getName() {
         return m_id.toString();
     }
@@ -66,7 +65,7 @@ public class PartyPrincipal implements Principal {
      *
      * @return <code>true</code> if the given object is a
      * <code>PartyPrincipal</code> with the same ID.
-     **/
+     */
     public boolean equals(Object that) {
         return (that instanceof PartyPrincipal)
             && this.m_id.equals(((PartyPrincipal)that).m_id);
@@ -75,7 +74,7 @@ public class PartyPrincipal implements Principal {
      * Returns the <code>hashCode</code> of the stored ID number.
      *
      * @return the <code>hashCode</code> of the stored ID number.
-     **/
+     */
     public int hashCode() {
         return this.m_id.hashCode();
     }

ccm-core/src/com/arsdigita/kernel/ui/Globalized.java

@@ -39,7 +39,6 @@ package com.arsdigita.kernel.ui;
  * @version $Revision: #6 $ $Date: 2004/08/16 $
  */
 public interface Globalized extends com.arsdigita.globalization.Globalized {
-    public final static String versionId = "$Id: Globalized.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
 
     public static final String BUNDLE_NAME = "com.arsdigita.kernel/ui/KernelResources";
 

ccm-core/src/com/arsdigita/kernel/ui/ResourceConfigComponent.java

@@ -40,10 +40,6 @@ import org.apache.log4j.Logger;
  * @author Daniel Berrange &lt;<a href="mailto:berrange@redhat.com">berrange@redhat.com</a>&gt;
  */
 public class ResourceConfigComponent extends SimpleContainer {
-    public static final String versionId =
-        "$Id: ResourceConfigComponent.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
         (ResourceConfigComponent.class);

ccm-core/test/src/com/arsdigita/runtime/RuntimeSuite.java

@@ -26,11 +26,8 @@ import junit.framework.Test;
  *
  * @version $Id: RuntimeSuite.java 750 2005-09-02 12:38:44Z sskracic $
  */
-
 public class RuntimeSuite extends PackageTestSuite {
 
-    public static final String versionId = "$Id: RuntimeSuite.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
     public static Test suite() {
         RuntimeSuite suite = new RuntimeSuite();
         populateSuite(suite);

ccm-core/test/src/com/arsdigita/runtime/StartupTest.java

@@ -27,8 +27,6 @@ import junit.framework.TestCase;
 
 public class StartupTest extends TestCase {
 
-    public static final String versionId = "$Id: StartupTest.java 752 2005-09-02 12:55:24Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
-
     public StartupTest(String name) {
         super(name);
     }

ccm-core/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java

@@ -40,7 +40,6 @@ import org.apache.log4j.Logger;
  * @version 1.0
  **/
 public class SearchIndexHelpTest extends TestCase {
-    public static final String versionId = "$Id: SearchIndexHelpTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
 
     // Creates a s_logging category with name = to the full name of class
     private static Logger s_log =

ccm-core/test/src/com/arsdigita/search/intermedia/SearchSuite.java

@@ -31,9 +31,9 @@ import junit.framework.TestSuite;
  *
  * @author Daniel Berrange
  * @version 1.0
- **/
+ */
 public class SearchSuite extends PackageTestSuite {
-    public static final String versionId = "$Id: SearchSuite.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+
     public SearchSuite() {
         super();
     }

ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java

@@ -35,7 +35,6 @@ import com.arsdigita.persistence.OID;
  * @author Jeff Teeters
  **/
 public class SearchTestAuthor extends ACSObject {
-    public static final String versionId = "$Id: SearchTestAuthor.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
 
     // Chapters associated with this author
     DataAssociation m_chapters = null;

ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBook.java

@@ -34,9 +34,8 @@ import java.math.BigDecimal;
  * for related objects.
  *
  * @author Jeff Teeters
- **/
+ */
 public class SearchTestBook extends ACSObject {
-    public static final String versionId = "$Id: SearchTestBook.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
 
     // Chapters associated with this book
     DataAssociation m_chapters = null;

ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java

@@ -34,7 +34,6 @@ import com.arsdigita.persistence.OID;
  * @author Jeff Teeters
  **/
 public class SearchTestBookH extends SearchableACSObject {
-    public static final String versionId = "$Id: SearchTestBookH.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
 
     // Chapters associated with this book
     DataAssociation m_chapters = null;

ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java

@@ -33,9 +33,8 @@ import com.arsdigita.persistence.OID;
  * (gathering content to index for related objects).
  *
  * @author Jeff Teeters
- **/
+ */
 public class SearchTestChapter extends ACSObject {
-    public static final String versionId = "$Id: SearchTestChapter.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
 
     public static final String BASE_DATA_OBJECT_TYPE =
         "com.arsdigita.search.intermedia.SearchTestChapter";

ccm-forum/src/com/arsdigita/forum/ui/ThreadsList.java

@@ -58,6 +58,11 @@ public class ThreadsList extends SimpleComponent implements Constants {
     /** Default max number of threads (rows) per page */
     private int m_pageSize = 15;
 
+    /**
+     * 
+     * @param p 
+     */
+    @Override
     public void register(Page p) {
         super.register(p);
         
@@ -92,6 +97,7 @@ public class ThreadsList extends SimpleComponent implements Constants {
      * @param state
      * @param parent
      */
+    @Override
     public void generateXML(PageState state,
                             Element parent) {
         // Begin of thread list, XSL constructs (and localizes) the list title bar

ccm-forum/src/com/arsdigita/forum/ui/ThreadsPanel.java

@@ -144,7 +144,8 @@ public class ThreadsPanel extends SimpleContainer
         Container forumOptions = new SimpleContainer(
                 FORUM_XML_PREFIX + ":forumOptions", Constants.FORUM_XML_NS);
         // XXX APLAWS standard theme currently (2010-09) does not use the label!
-        m_newThreadLink = new ToggleLink(new Label(GlobalizationUtil.gz("forum.ui.thread.newPost")));
+        m_newThreadLink = new ToggleLink(new Label(GlobalizationUtil.gz(
+                                                   "forum.ui.thread.newPost")));
         m_newThreadLink.setClassAttr("actionLink");
 
         // chris.gilbert@westsussex.gov.uk - security container added
@@ -168,9 +169,7 @@ public class ThreadsPanel extends SimpleContainer
         TopicSelector topics = new TopicSelector();
         forums.add(topics);
 
-        ThreadsList threads
+        ThreadsList threads = new ThreadsList();
-            = new ThreadsList();
-
         forums.add(threads);
 
         return forums;

ccm-sci-bundle/bundles/devel/cfg/project.xml

@@ -164,13 +164,17 @@
 
 <!--   Applications under evaluation  -->
         <!--  Currently broken.          -->
+<!--
         <ccm:application name="ccm-atoz"/>  
         <ccm:application name="ccm-atoz-siteproxy"/>  
         <ccm:application name="ccm-ldn-atoz"/>  
         <ccm:application name="ccm-docmgr"/> 
+-->        
         <!-- some minor program issues  -->
         <ccm:application name="ccm-portalserver"/>
-        <!-- currently doesn't work for unknown reason / no documentation  -->
+
+        <!-- currently doesn't work for unknown reason / no documentation 
+             currently doesn't load bundle (references to apm_packages)      -->
         <!-- <ccm:application name="ccm-simplesurvey"/> -->
         <!-- no documentation    -->
         <ccm:application name="ccm-weblog"/>