Commit Graph

3372 Commits (master)
 

Author SHA1 Message Date
pb 743ff9b5d4 Upstream r1794: Yet another Replacement of some deprecated classes and method invocations by supported API
git-svn-id: https://svn.libreccm.org/ccm/trunk@72 8810af33-2d31-482b-a856-94f89814c4df
2009-02-07 08:55:51 +00:00
pb c88891c8ba Upstream r1793: Replaced some deprecated classes and method invocations by supported API
git-svn-id: https://svn.libreccm.org/ccm/trunk@71 8810af33-2d31-482b-a856-94f89814c4df
2009-02-07 08:53:02 +00:00
quasi f9287812a2 Unterstützung für Xinha eingebaut. Läßt sich nun über waf.bebop.dhtml_editor="Xinha" aktivieren. Desweitern muß waf.bebop.dhtml_editor_src="/assets/xinha/XinhaLoader.js", gesetzt werden und Mandalay >= v0.8 RC3 (Rev. 77) benutzt werden.
git-svn-id: https://svn.libreccm.org/ccm/trunk@70 8810af33-2d31-482b-a856-94f89814c4df
2009-01-23 19:27:04 +00:00
pb 2b99335f5c Replaced usage of deprecated methods by supported API. We are now in sync with upstream r1763
git-svn-id: https://svn.libreccm.org/ccm/trunk@69 8810af33-2d31-482b-a856-94f89814c4df
2009-01-22 20:03:32 +00:00
pb ebeb59104d Removed style tag that wasn't closed, synchronizing with upstream r1761
git-svn-id: https://svn.libreccm.org/ccm/trunk@68 8810af33-2d31-482b-a856-94f89814c4df
2009-01-22 19:40:59 +00:00
pb d7d2845e5d Replaced some deprecated classes and methods by supported API
git-svn-id: https://svn.libreccm.org/ccm/trunk@67 8810af33-2d31-482b-a856-94f89814c4df
2009-01-22 01:24:19 +00:00
pb a9e6b82350 Patch to make APLAWS/CCM work with PostgreSQL 8.3, does not affect Oracle.
PostgreSQL 8.3 does no longer accept a mixture of integer and numeric fields in references/constrains. The modification 
eliminates a long standing performance complain by the analyze utility as well.

Update script provided, the Oracle version doesn't do anything at all. Postgres 8.x required for the update script to
work. If you use a 7.x version the upgrade isn't requirred and can savely be omitted.  


git-svn-id: https://svn.libreccm.org/ccm/trunk@66 8810af33-2d31-482b-a856-94f89814c4df
2008-12-25 23:39:20 +00:00
pb 712e43d266 incorporate several APLAWS patches for ccm-ldn-atoz:
r1741:	Changed AtoZ to not hide a category when an alias has been defined for it; 
	changed AtoZ to allow more than one alias to be defined for a category
r1742:	Added Category name in CategoryProviderAliasList.generateXML() 
r1743:	Fixed AtoZCategoryAlias.getCategory()
r1744:	Changed CategoryProviderAliasForm to use the Ajax category tree
r1747:	Relaxed version requirements for ccm-ldn-aplaws
r1750:	Added AtoZCategoryProvider.excludeBlackListTypes() 
1751:	Bumped version (release) number


git-svn-id: https://svn.libreccm.org/ccm/trunk@65 8810af33-2d31-482b-a856-94f89814c4df
2008-12-21 11:49:37 +00:00
pb 08ebde26fe incorporate several APLAWS patches for ccm-ldn-navigation:
r1727:	Fixed NPE when Content Item List portlet had no category selected.
r1748:	Added DataCollectionDefinition.setBlackListTypes() to filter for
	for content types which are blacklisted in the AtoZ module
r1749:	Bumped version number from 6.5.1 to 6.5.2



git-svn-id: https://svn.libreccm.org/ccm/trunk@64 8810af33-2d31-482b-a856-94f89814c4df
2008-12-21 11:38:09 +00:00
pb 76c1523cf7 ccm-core, addition to 68, forgot a svn add
git-svn-id: https://svn.libreccm.org/ccm/trunk@63 8810af33-2d31-482b-a856-94f89814c4df
2008-12-21 10:58:15 +00:00
pb 74e5c975a0 incorporate several APLAWS patches for ccm-ldn-portal:
r1718:	Adds a NavigationDirectoryPortlet (update provided)
r1739:	Adds a portlet for playing a Flash movie using SWFObject 1.5 (update provided)
r1745:	Fixed compilation error (StringReader cannot be converted to InputStream) 
r1746:	Fixed invalid characters in comments




git-svn-id: https://svn.libreccm.org/ccm/trunk@62 8810af33-2d31-482b-a856-94f89814c4df
2008-12-21 10:56:08 +00:00
pb 830a4cc875 incorporate several APLAWS patches for ccm-cms:
r1710:	CONTENT_ITEM constant is now public, so ajax components can set up the context.
r1711:	Upgraded web/assets/prototype.js to 1.6.0 from http://www.prototypejs.org/ 
r1729:	Added canPublish and canEdit attributes similar to normal content output.
r1731:	Content item portlet now checks read permissions.



git-svn-id: https://svn.libreccm.org/ccm/trunk@61 8810af33-2d31-482b-a856-94f89814c4df
2008-12-20 21:02:43 +00:00
pb 3521640c08 incorporate several APLAWS patches for ccm-core:
r1708:	Changed sync() to run() so unit tests now compile (LuceneTest.java, SearchTest.java).
r1709:	Created java equivalent of manipulate-input.js to convert titles to url form. 
r1720:	Converted formatting of code examples to <pre> tags (PackageTestSuite.java).
r1723:	NodeGenerator now has more context (parent object and property parameters)
	(SimpleDomainObjectXMLFormatter.java , NodeGenerator.java )
r1740:	Validates a value is a valid HTML hex code for a colour. 


git-svn-id: https://svn.libreccm.org/ccm/trunk@60 8810af33-2d31-482b-a856-94f89814c4df
2008-12-20 20:47:04 +00:00
quasi 6754f1cf85 AbstractObjectList geändert, so daß sie nur Objecte in der aktuellen (ausgehandelten) Sprache anzeigt.
Bitte AUSGIEBIG testen.



git-svn-id: https://svn.libreccm.org/ccm/trunk@59 8810af33-2d31-482b-a856-94f89814c4df
2008-11-29 18:49:13 +00:00
pb a6c0d33529 add fckeditor configuration
git-svn-id: https://svn.libreccm.org/ccm/trunk@58 8810af33-2d31-482b-a856-94f89814c4df
2008-06-22 13:53:36 +00:00
pb 02b52f11ac small bugfix for r56 sql upgrade script (vendor r1707)
git-svn-id: https://svn.libreccm.org/ccm/trunk@57 8810af33-2d31-482b-a856-94f89814c4df
2008-06-22 13:28:30 +00:00
pb 6b98a97dab Integrating vendor r1706: deleting apostrophes in properties file causing failure in folder permission setting.
git-svn-id: https://svn.libreccm.org/ccm/trunk@56 8810af33-2d31-482b-a856-94f89814c4df
2008-06-16 12:52:53 +00:00
pb 8dfe898a26 remove unnecessary jsp's, new welcome.jsp with configurable events and news
git-svn-id: https://svn.libreccm.org/ccm/trunk@55 8810af33-2d31-482b-a856-94f89814c4df
2008-06-11 19:22:27 +00:00
quasi 67e8559995 Kleine Fehlerkorrektur für lokaliserte Kategorien. Es war nicht möglich, lokalisierte Root-Kategorien anzulegen, weil das CategoryLocalizationAddForm bei Root-Kategorien ausgeblendet wurde.
git-svn-id: https://svn.libreccm.org/ccm/trunk@54 8810af33-2d31-482b-a856-94f89814c4df
2008-06-10 09:31:53 +00:00
pb e86029d00c Integration of vendor r1694: minor bugfix in globalization support
git-svn-id: https://svn.libreccm.org/ccm/trunk@53 8810af33-2d31-482b-a856-94f89814c4df
2008-06-09 13:36:22 +00:00
pb a8cafb0051 reformatting, nothing substantial
git-svn-id: https://svn.libreccm.org/ccm/trunk@52 8810af33-2d31-482b-a856-94f89814c4df
2008-06-09 13:33:57 +00:00
pb e5c5452255 Some reformatting and minor synchronization with vendor trunk (not substantial)
git-svn-id: https://svn.libreccm.org/ccm/trunk@51 8810af33-2d31-482b-a856-94f89814c4df
2008-06-09 13:26:22 +00:00
pb 03a4f6bb05 remove nbproject, it is too installation specific
git-svn-id: https://svn.libreccm.org/ccm/trunk@50 8810af33-2d31-482b-a856-94f89814c4df
2008-06-09 12:14:20 +00:00
pb c14e3fd524 Integration of vendor r1693 (various German localizations) and
r1704 (fixed sql update scripts)

Adding update scripts for category localization (r49, r53, r54) 
which are currently not added to vendor trunk.



git-svn-id: https://svn.libreccm.org/ccm/trunk@49 8810af33-2d31-482b-a856-94f89814c4df
2008-06-08 20:39:27 +00:00
pb 7ad23d2d04 Integrating vendor r1699 and r1705
both are an addendum to vendor r1628 and make the update script as well
as the main patch work in postgresql



git-svn-id: https://svn.libreccm.org/ccm/trunk@48 8810af33-2d31-482b-a856-94f89814c4df
2008-06-08 19:27:55 +00:00
pb 78965b7743 Integration of patch r1700 of vendor trunk:
Addendum for r1633 to make the update script work for postgres:
Split of the common update script in ~/sql/ccm-ldn-image-script/default/upgrade/
into separate scripts for Oracle and Postgresql to reflect syntax differences.

(patch makes a contact item capable to be associated with any other content item)



git-svn-id: https://svn.libreccm.org/ccm/trunk@47 8810af33-2d31-482b-a856-94f89814c4df
2008-06-08 17:11:01 +00:00
quasi 87563b9091 Registrierung der Config-Parameter für Categorization hinzufügen. Sonst gibt es Bruch beim Starten des Systems.
git-svn-id: https://svn.libreccm.org/ccm/trunk@46 8810af33-2d31-482b-a856-94f89814c4df
2008-06-05 14:23:38 +00:00
quasi 46e9e6559d Diese Dateien gehören noch zum CategoryLocalization Patch. Hatte ich vergessen hinzuzufügen.
git-svn-id: https://svn.libreccm.org/ccm/trunk@45 8810af33-2d31-482b-a856-94f89814c4df
2008-06-05 10:55:22 +00:00
pb a0ca3baa10 Reformatierung und Vereinheitlichung
git-svn-id: https://svn.libreccm.org/ccm/trunk@44 8810af33-2d31-482b-a856-94f89814c4df
2008-06-05 09:37:28 +00:00
quasi 78f4b6acc9 Navigation in die Suchseiten eingefügt. Offenbar verwenden wir doch ccm-ldn-search.
Quasi


git-svn-id: https://svn.libreccm.org/ccm/trunk@43 8810af33-2d31-482b-a856-94f89814c4df
2008-05-20 14:35:16 +00:00
quasi a8fc9eae95 Traversal-Adapter für Notes angepaßt. Offenbar werden in der neuen Version primitive Objectdaten nicht mehr automatisch ausgegeben. Dadurch wurde nur die ObjectID ausgegeben, was ziemlich sinnlos ist.
Quasi


git-svn-id: https://svn.libreccm.org/ccm/trunk@42 8810af33-2d31-482b-a856-94f89814c4df
2008-05-20 13:51:49 +00:00
quasi 42b45983b8 Dies ist die erste Version der lokalisierten Kategorien.
Folgendes funktioniert:

- Anlegen und Löschen von Sprachversionen per Adminoberfläche
- Config-Parameter für Fallback-Modus, unterstützte Sprachen und 
  Standard-Sprache
- Lokalisierte URLs in navigation
- Dekativieren von Sprachversionen

Folgendes funktioniert noch nicht:
- Bearbeiten von Sprachversionen per Adminoberfläche
- evt. ist die Untersützung von lokalisierten URLs noch nicht vollständig
  d.h. in anderen Anwendungen als navigation

Quasimodo



git-svn-id: https://svn.libreccm.org/ccm/trunk@41 8810af33-2d31-482b-a856-94f89814c4df
2008-05-08 18:35:32 +00:00
pb 606b7d90d9 Nachtrag zu r46: Auch das www Verzeichnis ist überflüssig
git-svn-id: https://svn.libreccm.org/ccm/trunk@40 8810af33-2d31-482b-a856-94f89814c4df
2008-02-16 13:26:58 +00:00
pb f28d08c51b Verschieben der Projektdateien in root in ein eigenes Verzeichnis (infrastructure), da es sonst beim update die Dateien im lokalen trunk überschreibt
git-svn-id: https://svn.libreccm.org/ccm/trunk@39 8810af33-2d31-482b-a856-94f89814c4df
2008-02-16 13:24:16 +00:00
pb 18816ea682 incorporating APLAWS patch:
r1690 | chrisg23 | 2007-10-26 15:11:10 +0200 (Fr, 26 Okt 2007) 
Bugfix - make sure search result links for multipart article sections work in Postgres


git-svn-id: https://svn.libreccm.org/ccm/trunk@38 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 21:32:06 +00:00
pb 5c56527e40 incorporate APLAWS patch
r1689 | chrisg23 | 2007-10-26 13:06:23 +0200 (Fr, 26 Okt 2007) 
Sourceforge Patch [1820586] - allow contact content items to be added as an asset to other content items


git-svn-id: https://svn.libreccm.org/ccm/trunk@37 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 21:28:46 +00:00
pb fbaf37a9ca incorporating APLAWS patch:
r1688 | chrisg23 | 2007-10-26 11:28:41 +0200 (Fr, 26 Okt 2007) 
Bugfix - need to set the application type's group during load


git-svn-id: https://svn.libreccm.org/ccm/trunk@36 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 21:24:05 +00:00
pb 8138d560a3 incporporating APLAWS patches 1686 & 1687:
r1686 | chrisg23 | 2007-10-23 16:11:16 +0200 (Di, 23 Okt 2007) 
Change sql to a version that both Oracle and Postgres understand
------------------------------------------------------------------------
r1687 | chrisg23 | 2007-10-23 16:16:50 +0200 (Di, 23 Okt 2007) 
sourceforge patch [1803373] - don't stream out blob data until it's actually needed. Note this is configurable so that by default there is no behaviour change, but really it would be unusual to actively want the overhead of the additional streamout. Credit to matt at magpie for this one


git-svn-id: https://svn.libreccm.org/ccm/trunk@35 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 21:06:03 +00:00
pb 9428bd1ffc incorporating APLAWS patch
r1685 | francois | 2007-10-15 09:57:47 +0200 (Mo, 15 Okt 2007) 

Add pdl quieries to return a category list containing only category with published content. Preserve default behaviour of a list containing all categories with an optional boolean ccm configuration parameter "com.arsdigita.london.atoz.filterCategoryProviders".
Set to TRUE will return the filtered list.


git-svn-id: https://svn.libreccm.org/ccm/trunk@34 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 20:58:45 +00:00
pb 8dc90db636 incorporating APLAWS patch
r1682 | chrisg23 | 2007-10-04 14:06:20 +0200 (Do, 04 Okt 2007) 
the previous sql only works in Postgres 8.x - this version is ok for 7,x too


git-svn-id: https://svn.libreccm.org/ccm/trunk@33 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 20:55:25 +00:00
pb 8dc70d5a42 incorporating APLAWS patch
r1681 | chrisg23 | 2007-10-03 17:04:55 +0200 (Mi, 03 Okt 2007) 
Parameter example wasn't a good example as it had content type names wrong


git-svn-id: https://svn.libreccm.org/ccm/trunk@32 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 20:52:58 +00:00
pb a3f1171a53 incorporating APLAWS patch
r1674 | chrisg23 | 2007-09-19 17:14:18 +0200 (Mi, 19 Sep 2007) 
Refactor - extract permission checks on action links so that concrete implementations may override the check if required


git-svn-id: https://svn.libreccm.org/ccm/trunk@31 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 20:45:08 +00:00
pb 7ec05e633f incorporating APLAWS patch
r1672 | chrisg23 | 2007-09-19 16:52:52 +0200 (Mi, 19 Sep 2007) 

Sourceforge patch 1797953 - remote search changes. No effect by default
(though I think we are the only people using remote search anyway)


git-svn-id: https://svn.libreccm.org/ccm/trunk@30 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 20:42:07 +00:00
pb 42133caec0 incorporating APLAWS r1669, r1670, r1671
r1669 | chrisg23 | 2007-09-19 15:10:46 +0200 (Mi, 19 Sep 2007) 
Sourceforge patch 1797770 - put all those portal workspaces into one tidy group instead of having them clutter up the top level of the group admin tree. execute ccm upgrade --from-version 6.5.0 --to-version 6.5.1 in order to create top level group and move existing groups
------------------------------------------------------------------------
r1670 | chrisg23 | 2007-09-19 15:21:20 +0200 (Mi, 19 Sep 2007) 
Sourceforge patch 1569884 - option to use your selected html editor for the freeform html portlet - switch it on with ccm set com.arsdigita.london.portal.portlet.freeform_html.wysiwyg_editor=true - by default there is no change. If you use fckeditor, the included config prevents access to back end file system or content centre via the link dialog (on our site non-authors customise their homepages).
------------------------------------------------------------------------
r1671 | chrisg23 | 2007-09-19 15:48:47 +0200 (Mi, 19 Sep 2007) 
Sourceforge patch 1797923 - move individual application details above application list at ccm/portal/admin/sitemap.jsp


git-svn-id: https://svn.libreccm.org/ccm/trunk@29 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 20:22:21 +00:00
pb 6acf25bc14 incorporating APLAWS patches 166-168:
r1666 | chrisg23 | 2007-09-19 12:40:53 +0200 (Mi, 19 Sep 2007) 
Currently date order categories work fine unless you have more than one page of objects - as the ordering is only done in xsl, when you have pagination, the java side returns a subset of objects ordered according to order set in jsp page (eg alphabetical) and then that subset is date ordered, but that means that as you page back and forth the date ordering is completely wrong. This change fixes that by enforcing date ordering in the java code if the current category is date ordered. Different object types have different attribute names for date - and only the renderer knows which attributes are available. I have added a method to the definition that gives the definition a reference to the renderer - the renderer now returns a list of attributes which the definition looks through and finds the first attribute that is of type date and uses that as the basis for date ordering if the current category is date ordered.If there is more than one date ordered attribute output in the list, then ensure the one used for ordering in xsl is the first one specified in jsp. I could have just made a setDateOrderAttribute method that takes a string attribute name argument and called that from the jsp page - it would have made the code quite a bit simpler. I chose this route to ensure that the date attribute specified for ordering in java was present in the datacollection, and so that there is no need to edit existing jsp pages. That is probably being overcautious though. Never mind, this works fine anyway - maybe one day I will refactor it to use the simpler approach
------------------------------------------------------------------------
r1667 | chrisg23 | 2007-09-19 12:48:36 +0200 (Mi, 19 Sep 2007) 
Continuation of changes in r1651 - output publisher flag on index pages too
------------------------------------------------------------------------
r1668 | chrisg23 | 2007-09-19 12:53:08 +0200 (Mi, 19 Sep 2007) 
See r1661 - ensure that this version of object-list.xsl caters for all listed objects, not just content pages, by referring to displayName (defined in ACSObject and now output on all object lists in default navigation jsp page


git-svn-id: https://svn.libreccm.org/ccm/trunk@28 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 19:07:48 +00:00
pb 00da3505ae incorporating APLAWS patch:
r1663 | chrisg23 | 2007-09-19 10:23:54 +0200 (Mi, 19 Sep 2007) 

Add association between image and link. Changes have no effect by themselves, but if the ccm-wsx-image-link-step module in contrib is loaded then the default image step is replaced with an asset step UI for associating the article image with one of the related links defined for the article. This change requires upgrade script to be run: ccm upgrade ccm-ldn-image-step --from-version 6.5.0 --to-version 6.5.1


git-svn-id: https://svn.libreccm.org/ccm/trunk@27 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 18:53:06 +00:00
pb fcd00bdf1b incorporating APLAWS patch:
r1661 | chrisg23 | 2007-09-19 09:33:20 +0200 (Mi, 19 Sep 2007)

Include applications on navigation pages where they have been assigned to navigation categories 
(currently possible for forums if the optional ccm-categorised-forum module in contrib/wsx is loaded).


git-svn-id: https://svn.libreccm.org/ccm/trunk@26 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 18:36:38 +00:00
pb e1cf71ad56 incoroirating APLAWS patches:
r1655 | chrisg23 | 2007-09-18 13:16:54 +0200 (Di, 18 Sep 2007) 
Sourceforge patch 1793047 - prevent attempt to transform xml if we java code has put an error in the response before generating any xml
------------------------------------------------------------------------
r1656 | chrisg23 | 2007-09-18 14:40:39 +0200 (Di, 18 Sep 2007) 
Undo change in r1370 - BaseDocument doesn't need to implement comparable as it is implemented in SearchResult (part of ccm-ldn-search) to enable merged results to be sorted
------------------------------------------------------------------------
r1657 | chrisg23 | 2007-09-18 14:43:10 +0200 (Di, 18 Sep 2007)
Make the static prepare utility method public
------------------------------------------------------------------------
r1658 | chrisg23 | 2007-09-18 14:46:04 +0200 (Di, 18 Sep 2007) 
Sourceforge patch 1793018 - utility to get stable urls programatically
------------------------------------------------------------------------
r1659 | chrisg23 | 2007-09-18 14:52:36 +0200 (Di, 18 Sep 2007) 
Make pdl attribute name constants public so they may be referenced elsewhere in persistence API calls
------------------------------------------------------------------------
r1660 | chrisg23 | 2007-09-18 15:05:43 +0200 (Di, 18 Sep 2007) 
Sourceforge patch 1793021 - output id attribute on bebop selects if it has been set in the java code
------------------------------------------------------------------------


git-svn-id: https://svn.libreccm.org/ccm/trunk@25 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 18:29:37 +00:00
pb 5b735f5dd6 incorporating APLAWS patch:
r1653 | chrisg23 | 2007-09-18 12:58:34 +0200 (Di, 18 Sep 2007) 
Small bugfix - if you have com.arsdigita.cms.types.mparticle.search.result_format=page_top then one page mparticles may have the word null added to the end of the title. This fixes the problem
------------------------------------------------------------------------
r1654 | chrisg23 | 2007-09-18 13:11:32 +0200 (Di, 18 Sep 2007) 
Sourceforge patch 1796980 - check with cms config parameter when deciding whether summary is mandatory in multipart article


git-svn-id: https://svn.libreccm.org/ccm/trunk@24 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 18:16:09 +00:00
pb 07c7ffa13a incorporate
r1651 | chrisg23 | 2007-09-18 12:30:06 +0200 (Di, 18 Sep 2007)
Geänderte Pfade:
Extension of Sourceforge patch 1679071 - add a flag to xml if user has publish privilege on the current page (only useful for non-caching sites)
------------------------------------------------------------------------
r1652 | chrisg23 | 2007-09-18 12:35:42 +0200 (Di, 18 Sep 2007) 
Sourceforge patch 1793108 - allow specific content types to be hidden from some users when creating a new item


git-svn-id: https://svn.libreccm.org/ccm/trunk@23 8810af33-2d31-482b-a856-94f89814c4df
2008-02-15 17:17:20 +00:00