From 5a1931825d7ad44087b479fcc0326a5b44c5a7cb Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 6 Mar 2011 12:59:55 +0000 Subject: [PATCH] Diverse Formatierungen, Anpassung bundle IAW. git-svn-id: https://svn.libreccm.org/ccm/trunk@780 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/cms/workflow/CMSTask.java | 2 +- .../portlet/ApplicationDirectoryPortlet.java | 3 +- .../london/portal/portlet/FlashPortlet.java | 34 +++++++++++++------ .../portlet/FlashPortletInitializer.java | 15 +++++--- .../portal/portlet/FreeformHTMLPortlet.java | 3 +- .../portal/portlet/MyWorkspacesPortlet.java | 3 +- .../portlet/WorkspaceSummaryPortlet.java | 9 +++-- .../standard/cfg/integration.properties | 2 +- .../src/com/arsdigita/aplaws/Loader.java | 2 ++ .../aplaws/ObjectTypeSchemaGenerator.java | 2 ++ environment/project.xml.iaw | 26 ++++++-------- environment/project.xml.zes | 2 +- 12 files changed, 63 insertions(+), 40 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java b/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java index ad49377c6..995edbf1c 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java @@ -72,7 +72,7 @@ import org.apache.log4j.Logger; * * @author Uday Mathur (umathu * @version $Id: CMSTask.java 1637 2007-09-17 10:14:27Z chrisg23 $ - **/ + */ public class CMSTask extends UserTask { public static final String BASE_DATA_OBJECT_TYPE = diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java index a015a5b5f..1e5c3fc13 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java @@ -27,7 +27,8 @@ import com.arsdigita.portal.Portlet; */ public class ApplicationDirectoryPortlet extends Portlet { - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet"; + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet"; public static final String CONTENT = "content"; diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java index 7332b9a3b..4411d979d 100644 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java @@ -29,13 +29,15 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.portal.Portlet; /** - * This portlet displays a Flash movie using SWFObject 1.5. + * This portlet displays a Flash movie using + * SWFObject 1.5. * * @author terry_permeance */ public class FlashPortlet extends Portlet { - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.portal.portlet.FlashPortlet"; + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.london.portal.portlet.FlashPortlet"; public static final String BACKGROUND_COLOUR = "backgroundColour"; @@ -96,7 +98,8 @@ public class FlashPortlet extends Portlet } /** - * Get the URL parameter name that the SWFObject script will look for when bypassing the detection (optional). + * Get the URL parameter name that the SWFObject script will look for when + * bypassing the detection (optional). * Default is "detectflash". * * @return the detect key @@ -107,7 +110,8 @@ public class FlashPortlet extends Portlet } /** - * Set the URL parameter name that the SWFObject script will look for when bypassing the detection (optional). + * Set the URL parameter name that the SWFObject script will look for when + * bypassing the detection (optional). * Default is "detectflash". * * @param detectKey @@ -178,7 +182,8 @@ public class FlashPortlet extends Portlet try { Properties parameters = new Properties(); - if (this.getParameters() != null && this.getParameters().trim().length() > 1) + if (this.getParameters() != null && this.getParameters() + .trim().length() > 1) { parameters.load(new StringBufferInputStream(this.getParameters())); } @@ -210,12 +215,15 @@ public class FlashPortlet extends Portlet } /** - * Set the quality for the Flash movie to play at. If no quality is specified, the default is "high". (optional) + * Set the quality for the Flash movie to play at. If no quality is + * specified, the default is "high". (optional) * * @param quality * the quality to set * - * @see Flash OBJECT and + * @see + * Flash OBJECT and * EMBED tag attributes< /a> documents the legal values for quality */ public void setQuality(String quality) @@ -224,7 +232,8 @@ public class FlashPortlet extends Portlet } /** - * Get the redirect URL for users who don't have the correct plug-in version (optional). + * Get the redirect URL for users who don't have the correct plug-in version + * (optional). * * @return the redirect URL */ @@ -234,7 +243,8 @@ public class FlashPortlet extends Portlet } /** - * Set the redirect URL for users who don't have the correct plug-in version. (optional). + * Set the redirect URL for users who don't have the correct plug-in version. + * (optional). * * @param redirectUrl * redirect URL to set @@ -328,7 +338,8 @@ public class FlashPortlet extends Portlet } /** - * Get the URL to redirect users who complete the ExpressInstall upgrade (optional). + * Get the URL to redirect users who complete the ExpressInstall upgrade + * (optional). * * @return the express install redirect URL */ @@ -338,7 +349,8 @@ public class FlashPortlet extends Portlet } /** - * Set the URL to redirect users who complete the ExpressInstall upgrade (optional). + * Set the URL to redirect users who complete the ExpressInstall upgrade + * (optional). * * @param xiRedirectUrl * express install redirect URL to set diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java index b909d7a1c..9a4367b75 100644 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java @@ -41,17 +41,20 @@ public final class FlashPortletInitializer */ public static void loadPortletType() { - PortletType type = PortletType.createPortletType("Flash movie", PortletType.WIDE_PROFILE, + PortletType type = PortletType.createPortletType( + "Flash movie", PortletType.WIDE_PROFILE, FlashPortlet.BASE_DATA_OBJECT_TYPE); type.setDescription("Displays a Flash movie"); } /** - * Initializes the {@link FlashPortlet} by registering the instantiator and portlet editor. + * Initializes the {@link FlashPortlet} by registering the instantiator + * and portlet editor. */ public static void initialize() { - DomainObjectFactory.registerInstantiator(FlashPortlet.BASE_DATA_OBJECT_TYPE, new ACSObjectInstantiator() + DomainObjectFactory.registerInstantiator( + FlashPortlet.BASE_DATA_OBJECT_TYPE, new ACSObjectInstantiator() { public DomainObject doNewInstance(DataObject dataObject) { @@ -61,13 +64,15 @@ public final class FlashPortletInitializer new ResourceTypeConfig(FlashPortlet.BASE_DATA_OBJECT_TYPE) { - public ResourceConfigFormSection getCreateFormSection(final ResourceType resType, + public ResourceConfigFormSection getCreateFormSection( + final ResourceType resType, final RequestLocal parentAppRL) { return new FlashPortletEditor(resType, parentAppRL); } - public ResourceConfigFormSection getModifyFormSection(final RequestLocal application) + public ResourceConfigFormSection getModifyFormSection( + final RequestLocal application) { return new FlashPortletEditor(application); } diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java index 0574b7413..6bdcbb316 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java @@ -27,7 +27,8 @@ import com.arsdigita.portal.Portlet; */ public class FreeformHTMLPortlet extends Portlet { - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.portal.portlet.FreeformHTMLPortlet"; + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.london.portal.portlet.FreeformHTMLPortlet"; public static final String CONTENT = "content"; diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java index c9219033c..ef7e3720a 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java @@ -107,7 +107,8 @@ class MyWorkspacesPortletRenderer extends AbstractPortletRenderer { query.close(); if (isEmpty) { - panel.add(new Label(GlobalizationUtil.globalize("cw.workspace.personal.none"))); + panel.add(new Label(GlobalizationUtil.globalize( + "cw.workspace.personal.none"))); } panel.generateXML(pageState, parent); diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java index d2c8661c4..6a9fadb51 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java @@ -61,7 +61,8 @@ public class WorkspaceSummaryPortlet extends AppPortlet { } //public String getZoomURL() { - // return URL.getDispatcherPath() + getParentApplication().getPrimaryURL() + "participants/"; + // return URL.getDispatcherPath() + getParentApplication().getPrimaryURL() + // + "participants/"; //} private static class WorkspaceSummaryPortletRenderer @@ -86,7 +87,8 @@ public class WorkspaceSummaryPortlet extends AppPortlet { String description = workspace.getDescription(); if (description != null) { - main.addSegment(new Label(GlobalizationUtil.globalize("cw.workspace.description")), new Label(description,false)); + main.addSegment(new Label(GlobalizationUtil.globalize( + "cw.workspace.description")), new Label(description,false)); } // should be a group @@ -116,7 +118,8 @@ public class WorkspaceSummaryPortlet extends AppPortlet { //searchLink.addURLVars("action", "search"); //participants.add(searchLink); - main.addSegment(new Label(GlobalizationUtil.globalize("cw.workspace.participants")), participants); + main.addSegment(new Label(GlobalizationUtil.globalize( + "cw.workspace.participants")), participants); main.generateXML(ps, parent); } diff --git a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties index fde7614d9..f2e89ef6c 100644 --- a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties +++ b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties @@ -127,7 +127,7 @@ waf.admin.password=nge2015 waf.admin.password.question=12345 waf.admin.password.answer=6 -waf.runtime.jdbc_url=jdbc\:postgresql\://134.102.3.27/zes?user\=zes&password\=zes +waf.runtime.jdbc_url=jdbc\:postgresql\://134.102.3.27/zes?user\=zes&password\=zes47web waf.runtime.jdbc_pool_size=60 waf.web.server=www.zes.uni-bremen.de\:80 diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java index 53c67b5e3..cdba38446 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -15,6 +15,7 @@ * 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.aplaws; import com.arsdigita.london.navigation.Navigation; @@ -69,6 +70,7 @@ public class Loader extends PackageLoader { "WEB-INF/aplaws/zes-nav-domain-1.00.xml", "WEB-INF/aplaws/zes-nav-hierarchy-1.00.xml" }; + private StringParameter m_navigationDomain; // private StringParameter m_servicesDomain; // private StringParameter m_interactionDomain; diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java index 56da85a78..ad36940b4 100644 --- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java +++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java @@ -15,6 +15,7 @@ * 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.aplaws; import com.arsdigita.xml.Element; @@ -369,4 +370,5 @@ public class ObjectTypeSchemaGenerator extends ObjectTypeTraversal { } m_property = (Property) m_properties.pop(); } + } diff --git a/environment/project.xml.iaw b/environment/project.xml.iaw index ca060ff7f..38a4d140a 100644 --- a/environment/project.xml.iaw +++ b/environment/project.xml.iaw @@ -7,8 +7,8 @@ ccmVersion="6.1" name="aplaws-iaw" prettyName="APLAWS plus" - version="1-0-9" - release="rc-5" + version="1-1-1" + release="rc2-780" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> @@ -23,6 +23,7 @@ + @@ -31,19 +32,14 @@ - - - - - @@ -54,14 +50,11 @@ + - - - - - + @@ -70,8 +63,8 @@ - - + + @@ -83,7 +76,6 @@ - @@ -98,6 +90,10 @@ + diff --git a/environment/project.xml.zes b/environment/project.xml.zes index adc89ae15..c7859b8ef 100644 --- a/environment/project.xml.zes +++ b/environment/project.xml.zes @@ -8,7 +8,7 @@ name="aplaws-zes" prettyName="APLAWS plus" version="1-1-1" - release="rc2-767" + release="rc2-772" webxml="web.xml-aplaws" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">