Commit Graph

462 Commits (8c3b2a4ab4e95fd65071b5fb7ce141be4f01d9a9)

Author SHA1 Message Date
pb 8c3b2a4ab4 Removed separate labels in ThemeForm and BasicItemForm. Labels are now part of the widget.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2698 8810af33-2d31-482b-a856-94f89814c4df
2014-06-13 07:35:37 +00:00
pb 88b61faeb6 Fixed: missing globalization in content-center (#1763), fixed layout of error message (part of #2090).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2697 8810af33-2d31-482b-a856-94f89814c4df
2014-06-13 06:32:36 +00:00
jensp 17c183a25a Included support for new label attribute at Bebop Widgets into Mandalay and the Heirloom theme.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2688 8810af33-2d31-482b-a856-94f89814c4df
2014-06-11 08:05:22 +00:00
pb a7119bb541 Last part of ThemeDirector code fix. Errors in validation of input fields is now displayed along the respective input field. Fixed uncought exception, unclosed result set, various missing globalization.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2682 8810af33-2d31-482b-a856-94f89814c4df
2014-06-09 22:25:17 +00:00
pb 6c272debdd Fixed problem with copying default theme to new theme's directory. Added Label as Widget attribute (but not evaluated by Mandalay theme engine). Still a NPE if theme evaluation detects an error, e.g. duplicate theme url.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2681 8810af33-2d31-482b-a856-94f89814c4df
2014-06-07 14:44:09 +00:00
jensp f6ae155a06 Load systeminformation from easy to change source.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2673 8810af33-2d31-482b-a856-94f89814c4df
2014-06-06 11:59:22 +00:00
pb 59252132a4 First part of Enhancing globalization of content-center (#1763). Text output is localized, but badly placed on the page. Needs further reworking of several classes.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2670 8810af33-2d31-482b-a856-94f89814c4df
2014-06-05 10:00:07 +00:00
jensp ebede11827 Integrated ButtonHelper for FancyBox2
git-svn-id: https://svn.libreccm.org/ccm/trunk@2665 8810af33-2d31-482b-a856-94f89814c4df
2014-06-04 10:49:14 +00:00
jensp 1c04f489fe Übernahme der Änderungen von Sidoine:
- jQuery aktualisiert
- Fancybox 2 integriert
- Xinha auf aktuelle Version aktualisert


git-svn-id: https://svn.libreccm.org/ccm/trunk@2664 8810af33-2d31-482b-a856-94f89814c4df
2014-06-02 12:11:06 +00:00
pb d287dcd760 Added task 'pluto-assemble' to the load ant project. It scans the portlet.xml file and injects for each portlet the Pluto specific registration code into web.xml. Should be executed after load-bundle step and is only needed when developing CCM JSR portlets in a Pluto test environment. Modified core web.xml accordingly.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2662 8810af33-2d31-482b-a856-94f89814c4df
2014-05-31 22:44:15 +00:00
jensp acd0b15c62 Finished testing of the new publication types for dramatic artsFinished testing of the new publication types for dramatic arts.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2661 8810af33-2d31-482b-a856-94f89814c4df
2014-05-31 14:55:58 +00:00
pb c703c92f82 Just another addendum.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2659 8810af33-2d31-482b-a856-94f89814c4df
2014-05-30 08:37:25 +00:00
pb b6f2cc147c Addendum to previous commit (r2657).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2658 8810af33-2d31-482b-a856-94f89814c4df
2014-05-30 06:32:31 +00:00
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 5097bfa76a Updated postgresJDBC driver to the latest 8.4 version and moved to CCM /WEB-INF/lib.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2651 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 09:46:14 +00:00
pb 6b0caaff4e Updated versions of Apache xml processors xerces (2.11.0) and xalan/xltc (2.7.2), release date April 2014,
git-svn-id: https://svn.libreccm.org/ccm/trunk@2646 8810af33-2d31-482b-a856-94f89814c4df
2014-05-23 06:12:58 +00:00
pb 7dd986442b First part of Tomcat 7 compatibility.
* Added Juli to classpath for ecdc Tomcat start script. "ant start" works.
* Fixed error in web-sci.xml, added surrounding <jsp-config> tags tp taglib tags.
* Removed jd.sclt transformer (no longer maintained, latest release from 2003
* Removed XML factory implementation configuration using system wide environment variables (affecting and probably conflicting with other webapps in the container). Alternative configuration facility not yet implemented, using container fallback (which is saxon at the moment for xslt processor).

CCM is currently execting in TC 7 for the public site, content-center doesn't work in TC 7 for now (but in TC6 as previously).
 


git-svn-id: https://svn.libreccm.org/ccm/trunk@2644 8810af33-2d31-482b-a856-94f89814c4df
2014-05-22 22:03:53 +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 e62f9c1727 Modified the RuntimeConfig#getJDBCURL() method. The method now first tries to lookup an JNDI datasource identified by
'java:/comp/env/jdbc/ccm-ds '. Then the method determines the URL from this datasource. Attention: This will only work if the JDBC-URL provided for the datasource is complete (the URL must contain username and password for the connection). 
If the datasource can't be aquired, the value from the runtime.properties files is used.


git-svn-id: https://svn.libreccm.org/ccm/trunk@2611 8810af33-2d31-482b-a856-94f89814c4df
2014-04-14 15:48:58 +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
jensp 8f786439e6 Some small improvments.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2582 8810af33-2d31-482b-a856-94f89814c4df
2014-03-24 06:03:30 +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 0702b6ac53 New content type for historic dates.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2573 8810af33-2d31-482b-a856-94f89814c4df
2014-03-19 15:43:38 +00:00
pb 98ac8c9f44 Some minor formatting
git-svn-id: https://svn.libreccm.org/ccm/trunk@2565 8810af33-2d31-482b-a856-94f89814c4df
2014-03-14 05:59:57 +00:00
pb 549e3e3723 Fixed various bugs in methods enabling CCM installed into any arbitrary context. Still needs testing!
git-svn-id: https://svn.libreccm.org/ccm/trunk@2564 8810af33-2d31-482b-a856-94f89814c4df
2014-03-11 09:09:20 +00:00
jensp 6fac837678 Missing file
git-svn-id: https://svn.libreccm.org/ccm/trunk@2563 8810af33-2d31-482b-a856-94f89814c4df
2014-03-10 20:18:44 +00:00
pb cfc3064fc6 "Another part of cleaning up dispatcher code and enable installation of CCM into any arbitrary application context."
git-svn-id: https://svn.libreccm.org/ccm/trunk@2560 8810af33-2d31-482b-a856-94f89814c4df
2014-03-07 08:20:15 +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
pb ea7c7bb5f5 Entwicklungsumgebung auf Servlet API 2.5 / jsp API 2.1 angehoben (wurde im Produktionsbetrieb durch Tomcat 6 bereits genutzt).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2539 8810af33-2d31-482b-a856-94f89814c4df
2014-02-25 00:24:18 +00:00
jensp 406f531a45 URLizer Javascript now handles german umlauts in upper case like 'Ü' correctly and transforms them to 'ue' instead of 'Ue'.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2532 8810af33-2d31-482b-a856-94f89814c4df
2014-02-19 13:37:55 +00:00
jensp 8aa2a7ea21 Avoiding NPE if there is no pane for managing instances of an application type yet (Ticket #2031)
git-svn-id: https://svn.libreccm.org/ccm/trunk@2528 8810af33-2d31-482b-a856-94f89814c4df
2014-02-19 12:25:23 +00:00
pb d3aa1fdb1a Einige fehlende Lokalisierungen ergänzt, veralteten Klassennamen korrigiert.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2527 8810af33-2d31-482b-a856-94f89814c4df
2014-02-19 09:20:42 +00:00
jensp 7aacf4d071 Current status of the Mandalay-YAML Theme
git-svn-id: https://svn.libreccm.org/ccm/trunk@2523 8810af33-2d31-482b-a856-94f89814c4df
2014-02-14 15:18:43 +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
pb 0452e8d327 Abschluss Synchronisation mit APLAWS trunk, entfernen static ID variable aus restlichen core Modulen. Synchron mit APLAWS r2682.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2505 8810af33-2d31-482b-a856-94f89814c4df
2014-02-01 09:11:13 +00:00
pb 7a7fccbcaa Synchronisation mit APLAWS trunk, vor allem Variable ID. Jetzt synchron mit APLAWS r2680.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2501 8810af33-2d31-482b-a856-94f89814c4df
2014-01-29 20:45:08 +00:00
pb 53935cc654 Synchronized core with APLAWS repository (r 2675 / part 1).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2488 8810af33-2d31-482b-a856-94f89814c4df
2014-01-14 00:15:27 +00:00
jensp f7298bca6b Pfad im Heirloom-Theme für ccm-core angepasst und Komptibilität mit alten Installationen zu gewährleisten
git-svn-id: https://svn.libreccm.org/ccm/trunk@2485 8810af33-2d31-482b-a856-94f89814c4df
2014-01-08 10:34:41 +00:00
jensp 5708731ebc - SiteBanner um Methoden für das Auslesen der einzelnen erweitert, diese können einfach überschrieben werden
- SubSiteBanner erstellt. Dies ist eine Unterklasse, die die Methode getSiteName() von SiteBanner überschreibt. Die überschriebene 
  Methode gibt den Namen der SubSite (aus dem Kontext) zurück und nicht wie SiteBanner den Namen aus der Konfiguration

Um das Default-Layout so zu ändern, dass der SubSiteBanner verwendet wird, muss derzeit noch die Konfiguration angepasst werden.


git-svn-id: https://svn.libreccm.org/ccm/trunk@2480 8810af33-2d31-482b-a856-94f89814c4df
2013-12-11 09:59:09 +00:00
quasi a62d12d63a OptionGroup
Ausgabe von Class Attributen

git-svn-id: https://svn.libreccm.org/ccm/trunk@2478 8810af33-2d31-482b-a856-94f89814c4df
2013-12-10 15:24:59 +00:00
quasi 9674328a05 Bebop Widget
Hinzugefügt:

Ausgabe von Class Attributen

git-svn-id: https://svn.libreccm.org/ccm/trunk@2475 8810af33-2d31-482b-a856-94f89814c4df
2013-12-10 14:07:00 +00:00