diff --git a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/Agenda.java b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/Agenda.java index 1baf7b00c..b41158924 100755 --- a/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/Agenda.java +++ b/ccm-cms-types-agenda/src/com/arsdigita/cms/contenttypes/Agenda.java @@ -24,12 +24,14 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.util.Assert; -import org.apache.log4j.Logger; import java.math.BigDecimal; import java.text.DateFormat; import java.util.Date; +import org.apache.log4j.Logger; + + /** * This content type represents an agenda data abject. * @@ -53,7 +55,7 @@ import java.util.Date; public class Agenda extends GenericArticle { /** Data object type for this domain object (for CMS compatibility) */ - private static final Logger s_log = Logger.getLogger(Logger.class); + private static final Logger s_log = Logger.getLogger(GenericArticle.class); // PDL stuff ************************************************************* /** PDL property name for summary */ @@ -192,6 +194,7 @@ public class Agenda extends GenericArticle { set(SUMMARY, summary); } + @Override public Date getCreationDate() { return (Date) get(CREATION_DATE); } @@ -202,6 +205,7 @@ public class Agenda extends GenericArticle { // Search stuff to allow the content type to be searchable public static final int SUMMARY_LENGTH = 200; + @Override public String getSearchSummary() { TextAsset ta = getTextAsset(); diff --git a/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortlet.java b/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortlet.java new file mode 100644 index 000000000..f6bcb36a4 --- /dev/null +++ b/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortlet.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2014 Peter Boy, Universitaet Bremen. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +package com.arsdigita.cms.portlet; + +import com.arsdigita.portal.JSRPortlet; + +import java.io.IOException; +import java.io.PrintWriter; +import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import org.apache.log4j.Logger; + + +/** + * Currently a wrapper for ContentItemPortlet to deliver content to an JSR + * compliant portal server. + * + * WORK IN PROGRESS! + * + * @author pb + */ +public class ContentItemJSRPortlet extends JSRPortlet { + + /** Internal logger instance to faciliate debugging. Enable logging output + * by editing /WEB-INF/conf/log4j.properties int the runtime environment + * and set com.arsdigita.portal.JSRPortlet=DEBUG + * by uncommenting or adding the line. */ + private static final Logger s_log = Logger.getLogger(ContentItemJSRPortlet.class); + + + /** + * + * @param request + * @param response + * @throws PortletException + * @throws IOException + */ + @Override + protected void doEdit(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PrintWriter writer = new PrintWriter(response.getWriter()); + writer.println("You're now in Edit mode."); + } + + /** + * + * @param request + * @param response + * @throws PortletException + * @throws IOException + */ + @Override + protected void doHelp(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PrintWriter writer = new PrintWriter(response.getWriter()); + writer.println("You're now in Help mode."); + } + + /** + * + * @param request + * @param response + * @throws PortletException + * @throws IOException + */ + @Override + protected void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PrintWriter writer = new PrintWriter(response.getWriter()); + writer.println("Hello world! You're in View mode."); + } + +} diff --git a/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortletResources.properties b/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortletResources.properties new file mode 100644 index 000000000..9b0e6515c --- /dev/null +++ b/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortletResources.properties @@ -0,0 +1,2 @@ +javax.portlet.title=CCM Single Content Item +javax.portlet.short-title=Single Content Item diff --git a/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortletResources_de.properties b/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortletResources_de.properties new file mode 100644 index 000000000..f191bda2f --- /dev/null +++ b/ccm-cms/src/com/arsdigita/cms/portlet/ContentItemJSRPortletResources_de.properties @@ -0,0 +1,2 @@ +javax.portlet.title=Ein CCM Dokument +javax.portlet.short-title=Einzeldokument diff --git a/ccm-cms/web/WEB-INF/portlet.xml b/ccm-cms/web/WEB-INF/portlet.xml new file mode 100644 index 000000000..b9d8ba30e --- /dev/null +++ b/ccm-cms/web/WEB-INF/portlet.xml @@ -0,0 +1,24 @@ + + + + ContentItemJSRPortlet + ContentItem JSR Portlet + Single Content Item + + com.arsdigita.cms.portlet.ContentItemJSRPortlet + + + text/html + VIEW + EDIT + HELP + + + Hello, Pluto at last! + + + \ No newline at end of file diff --git a/ccm-core/application.xml b/ccm-core/application.xml index fa35e42f8..f48292694 100755 --- a/ccm-core/application.xml +++ b/ccm-core/application.xml @@ -13,8 +13,11 @@ - - + + + + diff --git a/ccm-core/etc/lib/README b/ccm-core/etc/lib/README new file mode 100644 index 000000000..fe48878f4 --- /dev/null +++ b/ccm-core/etc/lib/README @@ -0,0 +1,5 @@ +ccm-core/etc/lib + contains the original distribution files of the libraries actually used in + ccm-core/lib and copied into CCM's WEB-INF/lib directory as external libs. + + The version in CCM's lib may be adapted to CCM's requirements. \ No newline at end of file diff --git a/ccm-core/etc/lib/Xerces-J-bin.2.11.0.zip b/ccm-core/etc/lib/xerces-J-bin.2.11.0.zip similarity index 100% rename from ccm-core/etc/lib/Xerces-J-bin.2.11.0.zip rename to ccm-core/etc/lib/xerces-J-bin.2.11.0.zip diff --git a/ccm-core/src/com/arsdigita/bebop/BebopConfig.java b/ccm-core/src/com/arsdigita/bebop/BebopConfig.java index da308d111..20487ccbf 100755 --- a/ccm-core/src/com/arsdigita/bebop/BebopConfig.java +++ b/ccm-core/src/com/arsdigita/bebop/BebopConfig.java @@ -64,8 +64,7 @@ public final class BebopConfig extends AbstractConfig { // ///////////////////////////////////////////////////////////////// /** - * - */ + * */ private final Parameter m_presenter = new SingletonParameter ("waf.bebop.presentation_manager", Parameter.REQUIRED, new PageTransformer()); diff --git a/ccm-core/src/com/arsdigita/portal/JSRPortlet.java b/ccm-core/src/com/arsdigita/portal/JSRPortlet.java new file mode 100644 index 000000000..70213b0b6 --- /dev/null +++ b/ccm-core/src/com/arsdigita/portal/JSRPortlet.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2014 Peter Boy, Universitaet Bremen. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +package com.arsdigita.portal; + +import javax.portlet.GenericPortlet; + +import org.apache.log4j.Logger; + +/** + * Currently a kind of wrapper class to enable CCM to deliver its portlets + * to JSR 286 compliant portal server. + * + * Currentliy WORK IN PROGRESS! + * + * @author pb + */ +public class JSRPortlet extends GenericPortlet { + + /** Internal logger instance to faciliate debugging. Enable logging output + * by editing /WEB-INF/conf/log4j.properties int the runtime environment + * and set com.arsdigita.portal.JSRPortlet=DEBUG + * by uncommenting or adding the line. */ + private static final Logger s_log = Logger.getLogger(JSRPortlet.class); + + +} diff --git a/ccm-core/src/com/arsdigita/portal/LegacyInitializer.java.nolongerInUse b/ccm-core/src/com/arsdigita/portal/LegacyInitializer.java.nolongerInUse deleted file mode 100755 index b147d6d29..000000000 --- a/ccm-core/src/com/arsdigita/portal/LegacyInitializer.java.nolongerInUse +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2002-2004 Red Hat Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package com.arsdigita.portal; - -import com.arsdigita.kernel.ACSObjectInstantiator; -import com.arsdigita.initializer.Configuration; -import com.arsdigita.initializer.InitializationException; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.domain.DomainObject; -import com.arsdigita.domain.DomainObjectFactory; -import org.apache.log4j.Logger; - - -// ////////////////////////////////////////////////// -// Replaced by NEW Initializer. -// Kept for the time of migration for easy reference. -// Will be removed later. -// ////////////////////////////////////////////////// - -/** - * - * - * Initializes the portal package. - * - * @author Justin Ross - * @version $Id: LegacyInitializer.java 738 2005-09-01 12:36:52Z sskracic $ - */ -public class LegacyInitializer implements com.arsdigita.initializer.Initializer { - - private static Logger s_log = Logger.getLogger(LegacyInitializer.class); - - private Configuration m_conf = new Configuration(); - - public LegacyInitializer() throws InitializationException { - /* Empty */ - } - - public Configuration getConfiguration() { - return m_conf; - } - - public void startup() { - DomainObjectFactory.registerInstantiator - (Portal.BASE_DATA_OBJECT_TYPE, new ACSObjectInstantiator() { - public DomainObject doNewInstance(DataObject dataObject) { - return new Portal(dataObject); - } - }); - } - - public void shutdown() { - /* Empty */ - } - -} diff --git a/ccm-core/src/com/arsdigita/portal/Portal.java b/ccm-core/src/com/arsdigita/portal/Portal.java index e0ef3b900..07313051a 100755 --- a/ccm-core/src/com/arsdigita/portal/Portal.java +++ b/ccm-core/src/com/arsdigita/portal/Portal.java @@ -39,10 +39,7 @@ import java.util.LinkedList; import org.apache.log4j.Logger; /** - * - * - *

A domain class for portals. A Portal has a set of {@link - * Portlet}s.

+ *

A domain class for portals. A Portal has a set of {@link Portlet}s.

* *

* A Portal is a Persistence-backed framework for aggregating content @@ -69,6 +66,7 @@ public class Portal extends Resource { private static final Logger s_log = Logger.getLogger(Portal.class); + @Override protected String getBaseDataObjectType() { return BASE_DATA_OBJECT_TYPE; } @@ -123,6 +121,7 @@ public class Portal extends Resource { * Create a new portal. * * @param title the default title of the portal template. + * @param parent * @return a new portal template. * @pre title != null * @post return != null @@ -221,6 +220,7 @@ public class Portal extends Resource { // Member properties // + @Override public String getTitle() { String title = (String)get("title"); @@ -229,6 +229,11 @@ public class Portal extends Resource { return title; } + /** + * + * @param title + */ + @Override public void setTitle(String title) { Assert.exists(title, String.class); @@ -253,7 +258,7 @@ public class Portal extends Resource { // Only the methods getPortletListForCell() and save() may access // this map. Otherwise, we endanger thread safety. - private Map m_cellPortletListMap = new HashMap(); + private final Map m_cellPortletListMap = new HashMap(); private synchronized LinkedList getPortletListForCell(int cellNumber) { Integer cellNumberInteger = new Integer(cellNumber); @@ -319,6 +324,7 @@ public class Portal extends Resource { /** * Return all of this Portal's Portlets for the given cell. * + * @param cellNumber * @return a set of Portlets in a PortletCollection. * @post return != null */ @@ -405,8 +411,10 @@ public class Portal extends Resource { } } - - + /** + * + */ + @Override protected void beforeSave() { if (s_log.isDebugEnabled()) { s_log.debug("In before save on portal " + this); diff --git a/ccm-core/src/com/arsdigita/web/Web.java b/ccm-core/src/com/arsdigita/web/Web.java index 0bee86d2b..63484a3c8 100755 --- a/ccm-core/src/com/arsdigita/web/Web.java +++ b/ccm-core/src/com/arsdigita/web/Web.java @@ -14,22 +14,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ + package com.arsdigita.web; import com.arsdigita.kernel.security.UserContext; import com.arsdigita.util.Assert; import com.arsdigita.util.StringUtils; -//import com.arsdigita.util.UncheckedWrapperException; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -//import java.util.HashMap; -//import java.util.Map; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; diff --git a/ccm-sci-bundle/bundles/devel/cfg/PlutoInjection.xml.in b/ccm-sci-bundle/bundles/devel/cfg/PlutoInjection.xml.in new file mode 100644 index 000000000..a76a7b73f --- /dev/null +++ b/ccm-sci-bundle/bundles/devel/cfg/PlutoInjection.xml.in @@ -0,0 +1,21 @@ + + + + ContentItemJSRPortlet + + org.apache.pluto.container.driver.PortletServlet + + + portlet-name + ContentItemJSRPortlet + + 1 + + + + ContentItemJSRPortlet + /PlutoInvoker/ContentItemJSRPortlet + diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci-woPluto.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci-woPluto.xml new file mode 100644 index 000000000..5a18481ea --- /dev/null +++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci-woPluto.xml @@ -0,0 +1,545 @@ + + + + Scientific CMS + Content and Collaboration Management for Scientific Institutions + + + + log4j-conf-file + WEB-INF/conf/log4j.properties + + + + + + + + shortcuts + com.arsdigita.shortcuts.ShortcutFilter + + + + subsite + com.arsdigita.subsite.SubsiteFilter + + + + + + + subsite + /* + + + + shortcuts + /* + + + + + com.arsdigita.web.CCMApplicationContextListener + + + + + + + ccm-dispatcher + com.arsdigita.web.CCMDispatcherServlet + 1 + + + + cache-manager + com.arsdigita.caching.CacheServlet + + + + db-test + com.arsdigita.web.monitoring.DBTestServlet + + + + versioning-log + com.arsdigita.versioning.VersioningServlet + + + + login + com.arsdigita.ui.login.LoginServlet + + + + webadmin + com.arsdigita.ui.admin.AdminServlet + + + + webadmin-permissions + com.arsdigita.ui.permissions.PermissionsServlet + + + + webdevsupport + com.arsdigita.webdevsupport.WebDevSupportServlet + + + + oid-redirect + com.arsdigita.web.OIDRedirectServlet + + + + resource-resolver + com.arsdigita.web.ResourceServlet + + + + + + content-center + com.arsdigita.cms.ContentCenterServlet + + + + content-section + com.arsdigita.cms.ContentSectionServlet + + + + cms-service + com.arsdigita.cms.ServiceServlet + + + + content-type-xsl + com.arsdigita.cms.dispatcher.ContentTypeXSLServlet + + + + content-item-xsl + com.arsdigita.cms.dispatcher.ContentItemXSLServlet + + + + template-xsl + com.arsdigita.cms.dispatcher.TemplateXSLServlet + + + + + + + + forum-main + com.arsdigita.forum.ForumServlet + + + + + portalworkspace-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-portalworkspace + + + + + navigation-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-navigation + + + file-resolver + com.arsdigita.navigation.NavigationFileResolver + + + + + portlet-type-xsl + com.arsdigita.dispatcher.PortletTypeXSLServlet + + + + + rssfeed-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-rssfeed + + + file-resolver + com.arsdigita.rssfeed.RSSFileResolver + + + + + + + search-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-search + + + + + AxisServlet + Apache-Axis Servlet + + org.apache.axis.transport.http.AxisServlet + + + + + + + shortcuts-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-shortcuts + + + + + + subsite-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-subsite + + + + + + + terms-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-ldn-terms + + + + + + + theme-files + com.arsdigita.web.ApplicationFileServlet + + template-path + /templates/ccm-themedirector + + + + + ThemeDownload + com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet + + + + ThemePreviewServlet + Servlet to allow admins to preview look/feel + + com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet + + + prefix + /theme + + + + + + + + + + forum-main + /forum-main/main/* + + + + + portlet-type-xsl + /themes/servlet/portlet-type/* + + + + portalworkspace-files + /ccm-portalworkspace/files/* + + + + navigation-files + /ccm-navigation/files/* + + + + + rssfeed-files + /ccm-rssfeed/files/* + + + + + + search-files + /ccm-ldn-search/files/* + + + + AxisServlet + /services/* + + + + + + shortcuts-files + /ccm-shortcuts/files/* + + + + + subsite-files + /ccm-subsite/files/* + + + + + + terms-files + /ccm-ldn-terms/files/* + + + + + + theme-files + /theme-files/* + + + + ThemeDownload + /theme-files/download/* + + + + ThemePreviewServlet + /theme/* + + + + + + + + ccm-dispatcher + /ccm/* + + + + cache-manager + /expireCache/* + + + + db-test + /dbtest + + + + versioning-log + /versioning/* + + + + login + /login/* + + + + webadmin + /admin/* + + + + webadmin-permissions + /admin-permissions/* + + + + webdevsupport + /webdevsupport/* + + + + oid-redirect + /redirect/* + + + + resource-resolver + /resource/* + + + + + + content-center + /templates/servlet/content-center/* + + + + content-section + /templates/servlet/content-section/* + + + + cms-service + /templates/servlet/cms-service/* + + + + content-item-xsl + /templates/servlet/content-item/* + + + + content-type-xsl + /themes/servlet/content-type/* + + + + template-xsl + /themes/servlet/template/* + + + + + + com.arsdigita.dispatcher.AccessDeniedException + /error/access-denied.jsp + + + + com.arsdigita.dispatcher.ObjectNotFoundException + /error/object-not-found.jsp + + + + com.arsdigita.kernel.permissions.PermissionException + /error/permission-denied.jsp + + + + com.arsdigita.persistence.DbNotAvailableException + /error/db-not-available.jsp + + + + com.arsdigita.db.DbNotAvailableException + /error/db-not-available.jsp + + + + java.lang.Exception + /error/general.jsp + + + + java.lang.Error + /error/general.jsp + + + + + + + /WEB-INF/bebop-show.tld + /WEB-INF/bebop-show.tld + + + + /WEB-INF/bebop-define.tld + /WEB-INF/bebop-define.tld + + + + diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml index 5a18481ea..57f6004d0 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml @@ -72,6 +72,27 @@ com.arsdigita.web.CCMApplicationContextListener + + + ContentItemJSRPortlet + + org.apache.pluto.container.driver.PortletServlet + + + portlet-name + ContentItemJSRPortlet + + 1 + + + + ContentItemJSRPortlet + /PlutoInvoker/ContentItemJSRPortlet + + + + + + + + + + + + + DEPRECATED! Use install-runtime instead. + Installing Liferay into ${app.server.webapp.dir}