Commit Graph

694 Commits (06e25503c74ca5cd5cd3d6a60e79a77ee419d3c2)

Author SHA1 Message Date
pb 1fcdb94194 Unfortunately quite a large update: Reorganized web.xml fragments into a separate directory, Modified build script to use the same web.xml merger as ccm installation script. NOTE: Logic bug fixed: If bundle specifies a web.xml, it is used as is without any postprocessing. If no web.xml is specified or the file does not exist, core's web.xml is used and the web.xml fragment of any module merged in.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2657 8810af33-2d31-482b-a856-94f89814c4df
2014-05-30 05:40:29 +00:00
pb fca3bbaf8a Removed deprecated classes CategoryPurpose, part 1.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2654 8810af33-2d31-482b-a856-94f89814c4df
2014-05-26 15:51:14 +00:00
pb aa06c3e866 Enhanced build system to handle WEB-INF/portlet.xml files. File is copied from bundel's cfg directory or merged from stub files (not implemented yet). Various housekeeping done.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2653 8810af33-2d31-482b-a856-94f89814c4df
2014-05-26 09:24:06 +00:00
pb d5499cd6eb Added first very minimalistic support for JSR286 compliant portlet support installable in Apache Pluto portlet server. i
Modify local.runtime.properties to use Pluto (uncomment the Pluto lines) and use 'ant install-runtime' to install Pluto as test environment. 
Modify project.xml to install ccm into an other context as ROOT! libreccm may be a nice choice. 
Deploy and load-bundle as usual. 
Invoke http://localhost:8080/libreccm to operate CCM as usual. 
Invoke http://localhost:8080/pluto to operate Pluto, login as admin and use Pluto admin tool to add ContentItemJSRPortlet to the Pluto Portal page (displays currently a simple HelloWorld Text).





git-svn-id: https://svn.libreccm.org/ccm/trunk@2652 8810af33-2d31-482b-a856-94f89814c4df
2014-05-25 20:24:49 +00:00
pb ae9f7503c0 Fixed jsp's to be compatibel with Tomcat 7 and Jasper
git-svn-id: https://svn.libreccm.org/ccm/trunk@2650 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 09:35:04 +00:00
jensp 445cdef0dc Labels/Texts on ImageSelectPage (which is used for example when inserting an image using the RichText editor) are now localised.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2642 8810af33-2d31-482b-a856-94f89814c4df
2014-05-22 15:29:28 +00:00
jensp 18be8f11c6 - Refactored the FolderManipulator, removing potential NPE etc.
- Texts in the select boxes of the subsite admin form are now localised (Ticket #2032).


git-svn-id: https://svn.libreccm.org/ccm/trunk@2636 8810af33-2d31-482b-a856-94f89814c4df
2014-05-20 09:56:53 +00:00
jensp 6382af5c68 - Change password link: Added URL and title to CMSGlobalNavigation and
UserBanner (like logout link) and added support to Mandalay
- Some formatting


git-svn-id: https://svn.libreccm.org/ccm/trunk@2629 8810af33-2d31-482b-a856-94f89814c4df
2014-04-29 17:52:26 +00:00
jensp 76b9482c9b URL changes on an item are now propagated to the bundle and all instances (Issue #2042)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2623 8810af33-2d31-482b-a856-94f89814c4df
2014-04-25 07:28:09 +00:00
jensp 12391d31f1 Fix for Issue #2052 (Languages independent options appears twice when activated)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2622 8810af33-2d31-482b-a856-94f89814c4df
2014-04-25 07:05:11 +00:00
jensp 069be900f6 Serveral small bug fixes and cleanups.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2594 8810af33-2d31-482b-a856-94f89814c4df
2014-04-01 16:59:52 +00:00
jensp d1057f7475 - Formatting
- Added more entities to the PDLEntities UML diagram


git-svn-id: https://svn.libreccm.org/ccm/trunk@2584 8810af33-2d31-482b-a856-94f89814c4df
2014-03-24 18:04:10 +00:00
pb 38313c1e5f Added documentation, enhanced formatting.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2581 8810af33-2d31-482b-a856-94f89814c4df
2014-03-24 01:59:58 +00:00
pb 9c63398588 Fixed bug in findResource and Dispatcher.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2577 8810af33-2d31-482b-a856-94f89814c4df
2014-03-21 00:15:30 +00:00
jensp b396010920 Changed the column type for the abstract and misc properties of Publications from varchar(4096) to text. It also now possible to enable the HTML editor for the abstract and misc fields of publications. The default is still no HTML editor.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2558 8810af33-2d31-482b-a856-94f89814c4df
2014-03-07 06:52:42 +00:00
pb 13b7c7cf2e Unfortunately quite a large update, combined BaseDispatcher and DispatcherServlet into a modern, standard compliant CCMDispatcherServlet, modified various classes to enable CCM installed in any arbitrary context, not just ROOT. Part 1. Currently it works for ScientificCMS only, for other bundles StylesheetPaths.txt has to be modified.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2557 8810af33-2d31-482b-a856-94f89814c4df
2014-03-06 12:53:03 +00:00
jensp c21769dfc8 - Localisation for Search (ResultsPane), Ticket #1762
- Some formating


git-svn-id: https://svn.libreccm.org/ccm/trunk@2553 8810af33-2d31-482b-a856-94f89814c4df
2014-03-04 18:35:21 +00:00
jensp 1b23384b47 - Association between GenericContact and GenericAddress is now modeled like other associations (necessary to work around limitations in the publication process and of PDL). Solves Ticket #2039.
- Is was not possible to remove a address from a contact. See #2017.

Attention: Database Upgrade ccm-cms-6.6.10-6.6.11 required for existing databases!



git-svn-id: https://svn.libreccm.org/ccm/trunk@2547 8810af33-2d31-482b-a856-94f89814c4df
2014-03-01 14:03:23 +00:00
jensp 4aed32729b The publish lock mechanism in ccm-cms now stores the stacktrace of an eventual error in the database. This simplifies the analysis of problems in the publication process. In the catalina.log it is often difficult to find the correct stacktrace.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2546 8810af33-2d31-482b-a856-94f89814c4df
2014-02-28 09:59:07 +00:00
jensp 06b2bbb509 Formatierungen etc
git-svn-id: https://svn.libreccm.org/ccm/trunk@2545 8810af33-2d31-482b-a856-94f89814c4df
2014-02-28 08:47:57 +00:00
pb 5ea3d3a733 Fixed various globalization issues (parts of ticket #1994).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2538 8810af33-2d31-482b-a856-94f89814c4df
2014-02-22 08:32:30 +00:00
jensp 3d25fc7630 Removed creation of new content sections via the initializer (Ticket #2029)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2530 8810af33-2d31-482b-a856-94f89814c4df
2014-02-19 13:18:12 +00:00
pb 757675c0e6 Some minor formatting, some Globalikzation keys added.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2526 8810af33-2d31-482b-a856-94f89814c4df
2014-02-18 09:44:37 +00:00
jensp 7d84a5dbfe Some ajustments for the admin.css.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2515 8810af33-2d31-482b-a856-94f89814c4df
2014-02-11 11:00:44 +00:00
pb e87d1fb2dc * Changed name of default content section from "main" to "info" (ticket #1606)
* Removed class StackTraces from developer support (not useful anymore but causes probs in production)



git-svn-id: https://svn.libreccm.org/ccm/trunk@2514 8810af33-2d31-482b-a856-94f89814c4df
2014-02-09 09:42:17 +00:00
jensp f23dfe7b10 Corrections of the JavaDoc comments of various classes which were causing warnings when creating the JavaDoc.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2507 8810af33-2d31-482b-a856-94f89814c4df
2014-02-05 09:16:48 +00:00
jensp 2cafab36d3 Some BugFixing for the CategoryMoveForm
git-svn-id: https://svn.libreccm.org/ccm/trunk@2498 8810af33-2d31-482b-a856-94f89814c4df
2014-01-23 14:23:05 +00:00
jensp d4ba58f0f8 Ergänzung der Resourcendatei für ccm-cms
git-svn-id: https://svn.libreccm.org/ccm/trunk@2497 8810af33-2d31-482b-a856-94f89814c4df
2014-01-23 09:43:11 +00:00
jensp b7bf443151 Some adjustments for the CategoryMoveForm
git-svn-id: https://svn.libreccm.org/ccm/trunk@2494 8810af33-2d31-482b-a856-94f89814c4df
2014-01-22 15:35:32 +00:00
jensp f6d8bb92cf Categories can now be moved using the category ui in the content center
git-svn-id: https://svn.libreccm.org/ccm/trunk@2493 8810af33-2d31-482b-a856-94f89814c4df
2014-01-22 13:46:56 +00:00
quasi a4a641eb25 LinkPropertiyForm
Geändert:
Klasse für die FieldSets hinzugefügt

git-svn-id: https://svn.libreccm.org/ccm/trunk@2483 8810af33-2d31-482b-a856-94f89814c4df
2013-12-15 15:27:18 +00:00
quasi 88c839252d Update Skript für die Ersetzung von ArticleImage durch ImageStepAsset
git-svn-id: https://svn.libreccm.org/ccm/trunk@2481 8810af33-2d31-482b-a856-94f89814c4df
2013-12-13 10:00:46 +00:00
quasi 615996dbb4 Aktualisierung von Mandalay auf die aktuelle Version
git-svn-id: https://svn.libreccm.org/ccm/trunk@2479 8810af33-2d31-482b-a856-94f89814c4df
2013-12-10 15:38:07 +00:00
quasi 8a7131a612 ImageSelectPage
Korrektur für das neue Layout eingeführt

git-svn-id: https://svn.libreccm.org/ccm/trunk@2477 8810af33-2d31-482b-a856-94f89814c4df
2013-12-10 15:19:52 +00:00
quasi 58e1036a95 Fancybox Caption korrigiert
git-svn-id: https://svn.libreccm.org/ccm/trunk@2476 8810af33-2d31-482b-a856-94f89814c4df
2013-12-10 14:12:48 +00:00
jensp c3e91230ad Link zum Zurücksetzen des Start-Ordners/Home-Folders in den Folder-Browser integriert, Tab "Benutzerverwaltung" auskommentiert.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2474 8810af33-2d31-482b-a856-94f89814c4df
2013-12-10 11:50:00 +00:00
quasi c8be91ff92 ImageAsset + ReuseableImageAsset
* JAI ersetzt durch ImageIO (#1941)
* ReusableImageAsset ausgeräumt und alle unnötigen Code-Dopplungen entfernt
* ImageAsset umgestellt auf ImageIO. Fehlerhafte guessImageSize durch eine zuverlässiger funktionierende Methode ersetzt.



git-svn-id: https://svn.libreccm.org/ccm/trunk@2461 8810af33-2d31-482b-a856-94f89814c4df
2013-11-26 21:53:31 +00:00
quasi e85fde631b Eindeutige Id's CC (#1699)
erledigt

git-svn-id: https://svn.libreccm.org/ccm/trunk@2460 8810af33-2d31-482b-a856-94f89814c4df
2013-11-26 21:05:01 +00:00
jensp edd6971282 Änderungen am Handling von Ordnern aus der Konfiguration für die ItemSearchCreatePane (Ticket #1838). Ordner jetzt außerdem anhand ihres Pfades konfiguriert werden.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2459 8810af33-2d31-482b-a856-94f89814c4df
2013-11-26 11:56:41 +00:00
jensp 5070517f5a Erster Teil einer Lösung für Ticket #1838 (ItemCreatePane und nicht vorhandener Standard-Order).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2458 8810af33-2d31-482b-a856-94f89814c4df
2013-11-25 12:24:18 +00:00
quasi 0748e2e601 Link "Arbeitsablauf starten" (#1988)
* Linktext geändert
* Task werden beim Neustarten über AssignedTaskSection nun automatisch reserviert, falls diese noch nicht reserviert sind. 

Zu beachten ist, daß der Workflow und Reservierung der Tasks von einander unabhängig sind. Das Stoppen eines Workflows hat keinen Einfluß auf den Reservierungstatus der Tasks.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2456 8810af33-2d31-482b-a856-94f89814c4df
2013-11-25 07:07:47 +00:00
jensp 7f79f1da6a Kategorienfilter arbeitet jetzt korrekt (durchsucht nur die ausgewählte Kategorie)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2448 8810af33-2d31-482b-a856-94f89814c4df
2013-11-22 09:22:30 +00:00
quasi 818b0785cf Workflows werden nun auch bei einem Republish korrekt zurückgesetzt.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2447 8810af33-2d31-482b-a856-94f89814c4df
2013-11-22 09:01:05 +00:00
quasi a430009ed2 Formatierung korrigiert
git-svn-id: https://svn.libreccm.org/ccm/trunk@2446 8810af33-2d31-482b-a856-94f89814c4df
2013-11-22 09:00:13 +00:00
quasi 2dbb575b90 LinkPropertyForm
Klasse autoHide zum fieldset hinzugefügt

git-svn-id: https://svn.libreccm.org/ccm/trunk@2441 8810af33-2d31-482b-a856-94f89814c4df
2013-11-20 13:22:20 +00:00
quasi 1807b0084a Fieldset Klasse hinzugefügt
LinkPropertyForm: um die Verwendung von Fieldset erweitert
ImageLibraryComponent: Klasse für den Upload-Link hinzugefügt

git-svn-id: https://svn.libreccm.org/ccm/trunk@2439 8810af33-2d31-482b-a856-94f89814c4df
2013-11-20 12:57:27 +00:00
jensp 98110662e7 Bugfix für den Kategorienfilter (Separator für mehrere Kategorien wurde nicht überall beachtet)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2437 8810af33-2d31-482b-a856-94f89814c4df
2013-11-15 08:02:28 +00:00
quasi 35647b1d2b Hinweistext für die Suche eingefügt
git-svn-id: https://svn.libreccm.org/ccm/trunk@2435 8810af33-2d31-482b-a856-94f89814c4df
2013-11-14 10:07:04 +00:00
jensp ae2d4faad3 Verschiedener Kleinkram, unter anderem Tippfehler und Formatierung
git-svn-id: https://svn.libreccm.org/ccm/trunk@2433 8810af33-2d31-482b-a856-94f89814c4df
2013-11-09 14:55:05 +00:00
jensp b4c8a8ca96 - ListView für SciDepartment um Abteilungsleitung usw. erweitert.
- fehlende Lizenzheader und Kommentare für ccm-sci-types-department ergänzt


git-svn-id: https://svn.libreccm.org/ccm/trunk@2428 8810af33-2d31-482b-a856-94f89814c4df
2013-11-07 19:53:19 +00:00