LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Diverse Formatierungen, Anpassung bundle IAW. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@780 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-03-06 12:59:55 +00:00
parent 7211764180
commit 5a1931825d
12 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
View File

@ -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 =

3
ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java
View File

@ -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";

34
ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java
View File

@ -29,13 +29,15 @@ import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
/**
* This portlet displays a Flash movie using <a href="http://blog.deconcept.com/swfobject/">SWFObject 1.5</a>.
* This portlet displays a Flash movie using
* <a href="http://blog.deconcept.com/swfobject/">SWFObject 1.5</a>.
*
* @author <a href="https://sourceforge.net/users/terry_permeance/">terry_permeance</a>
*/
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 <a href="http://kb.adobe.com/selfservice/viewContent.do?externalId=tn_12701&sliceId=2">Flash OBJECT and
* @see <a href=
* "http://kb.adobe.com/selfservice/viewContent.do?externalId=tn_12701&sliceId=2">
* 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

15
ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java
View File

@ -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);
}

3
ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java
View File

@ -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";

3
ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java
View File

@ -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);

9
ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java
View File

@ -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);
}

2
ccm-zes-aplaws/bundles/standard/cfg/integration.properties
View File

@ -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

2
ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
View File

@ -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;

2
ccm-zes-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java
View File

@ -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();
}
}

26
environment/project.xml.iaw
View File

@ -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 @@
<!-- Content Assets -->
<!-- - - - - - - - -->
<ccm:application name="ccm-cms-assets-fileattachment"/>
<ccm:application name="ccm-cms-assets-imagestep"/>
<ccm:application name="ccm-cms-assets-notes"/>
<ccm:application name="ccm-cms-assets-relatedlink"/>
@ -31,19 +32,14 @@
<!-- <ccm:application name="ccm-cms-types-address"/> -->
<!-- <ccm:application name="ccm-cms-types-agenda"/> -->
<ccm:application name="ccm-cms-types-article"/>
<ccm:application name="ccm-cms-types-baseAddress"/>
<ccm:application name="ccm-cms-types-baseContact"/>
<ccm:application name="ccm-cms-types-bookmark"/>
<!-- <ccm:application name="ccm-cms-types-contact"/> -->
<!-- <ccm:application name="ccm-cms-types-esdservice"/> -->
<ccm:application name="ccm-cms-types-event"/>
<!-- faqitem not needed by IAW -->
<!-- <ccm:application name="ccm-cms-types-faqitem"/> -->
<ccm:application name="ccm-cms-types-filestorageitem"/>
<ccm:application name="ccm-cms-types-formitem"/>
<ccm:application name="ccm-cms-types-formsectionitem"/>
<ccm:application name="ccm-cms-types-genericorganization"/>
<!-- glossaryitem not needed by IAW, too -->
<!-- <ccm:application name="ccm-cms-types-glossaryitem"/> -->
<!-- <ccm:application name="ccm-cms-types-htmlform"/> -->
<!-- <ccm:application name="ccm-cms-types-inlinesite"/> -->
@ -54,14 +50,11 @@
<ccm:application name="ccm-cms-types-mparticle"/>
<ccm:application name="ccm-cms-types-newsitem"/>
<!-- <ccm:application name="ccm-cms-types-organization"/> -->
<!-- <ccm:application name="ccm-cms-types-person"/> -->
<!-- <ccm:application name="ccm-cms-types-pressrelease"/> -->
<!-- <ccm:application name="ccm-cms-types-service"/> -->
<ccm:application name="ccm-cms-types-organizationalunit"/>
<ccm:application name="ccm-cms-types-person"/>
<ccm:application name="ccm-cms-types-siteproxy"/>
<ccm:application name="ccm-cms-types-researchnetwork"/>
<!-- xmlfeed is not needed by IAW, too -->
<!-- <ccm:application name="ccm-cms-types-xmlfeed"/> -->
<!-- <ccm:application name="ccm-cms-types-xmlfeed"/> -->
<!-- Applications -->
<!-- - - - - - - -->
@ -70,8 +63,8 @@
<!-- temporarily excluded, produces errors in the build process
<ccm:application name="ccm-docmngr"/> -->
<!-- <ccm:application name="ccm-formbuilder-pdf"/> -->
<ccm:application name="ccm-forum"/>
<ccm:application name="ccm-simplesurvey"/>
<!-- <ccm:application name="ccm-forum"/> -->
<!-- <ccm:application name="ccm-simplesurvey"/> -->
<ccm:application name="ccm-user-preferences"/>
<!-- <ccm:application name="ccm-weblog"/> -->
<!-- <ccm:application name="ccm-webpage"/> -->
@ -83,7 +76,6 @@
<!-- <ccm:application name="ccm-ldn-dublin"/> -->
<!-- <ccm:application name="ccm-ldn-exporter"/> -->
<!-- <ccm:application name="ccm-ldn-freeform"/> -->
<ccm:application name="ccm-ldn-image-step"/>
<!-- <ccm:application name="ccm-ldn-importer"/> -->
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-portal"/>
@ -98,6 +90,10 @@
<!-- IAW extension -->
<!-- - - - - - - - -->
<!-- <ccm:application name="ccm-cms-dabinimporter" />
<ccm:application name="ccm-sci-types-organization"/>
<ccm:application name="ccm-sci-publications"/>
-->
<ccm:application name="ccm-iaw-aplaws"/>

2
environment/project.xml.zes
View File

@ -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">