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

Diverse Kleingkeiten, Formatierungen, etc. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@909 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-05-14 10:42:42 +00:00
parent f45285e98d
commit c5e69c2947
9 changed files with 132 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-docmgr/src/com/arsdigita/cms/docmgr/LegacyCategoryBrowserApplication.java
View File

@ -48,7 +48,7 @@ public class LegacyCategoryBrowserApplication extends Application {
private DocFolder m_root = null; private DocFolder m_root = null;
/** /**
* Retreives a repository from the database usings its OID. * Retrieves a repository from the database usings its OID.
* *
* @param oid the OID of the repository * @param oid the OID of the repository
*/ */

4
ccm-forum/src/ccm-forum.upgrade
View File

@ -9,10 +9,10 @@
<script sql="ccm-forum/upgrade/::database::-6.5.0-6.5.1.sql"/> <script sql="ccm-forum/upgrade/::database::-6.5.0-6.5.1.sql"/>
<script class="com.arsdigita.forum.upgrade.CreateGroupsAndPortletType"/> <script class="com.arsdigita.forum.upgrade.CreateGroupsAndPortletType"/>
</version> </version>
<version from="6.5.1" to="6.5.2"> <version from="6.5.1" to="6.5.2">
<script class="com.arsdigita.forum.upgrade.CreateContainerGroups"/> <script class="com.arsdigita.forum.upgrade.CreateContainerGroups"/>
</version> </version>
<version from="6.6.0" to="6.6.1"> <version from="6.6.0" to="6.6.1">
<script sql="ccm-forum/upgrade/::database::-6.6.0-6.6.1.sql"/> <script sql="ccm-forum/upgrade/::database::-6.6.0-6.6.1.sql"/>
</version> </version>
</upgrade> </upgrade>

2
ccm-forum/src/com/arsdigita/forum/upgrade/CreateGroupsAndPortletType.java
View File

@ -89,7 +89,7 @@ public class CreateGroupsAndPortletType extends Program {
}.run(); }.run();
} }
public static final void main(final String[] args) { public static void main(final String[] args) {
new CreateGroupsAndPortletType().run(args); new CreateGroupsAndPortletType().run(args);
} }

13
ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
View File

@ -266,10 +266,20 @@ public class Loader extends PackageLoader {
registerDomain(customNavKey, "/content/", customNavUseContext); registerDomain(customNavKey, "/content/", customNavUseContext);
// Switch /portal/ to use 1 column layout for funky aplaws stuff. // Switch /portal/ to use 1 column layout for funky aplaws stuff.
// pboy: This will have no effect at all. A portal page created at
// url /portal/ (and beneath) will always use the homepage jsp's which
// are hardcoded to create a three column design and ignore any
// column configuration. All portal pages at other urls are not
// affect by this setting which touches only the one application (portal)
// at url /portal/. Portal pages at other urls use the corresponding
// configuration parameter for its initial value and number of columns
// may be modified at any time using configuration ui.
/*
Workspace portal = (Workspace)Application Workspace portal = (Workspace)Application
.retrieveApplicationForPath("/portal/"); .retrieveApplicationForPath("/portal/");
portal.setDefaultLayout(PageLayout portal.setDefaultLayout(PageLayout
.findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN)); .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN));
*/
} }
public void registerServicesTemplate(String appURL) { public void registerServicesTemplate(String appURL) {
@ -283,7 +293,8 @@ public class Loader extends PackageLoader {
"APLAWS ESD Toolkit Services", "APLAWS ESD Toolkit Services",
"/packages/navigation/templates/aplaws-services.jsp"); "/packages/navigation/templates/aplaws-services.jsp");
new TemplateMapping( template, root, Template.DEFAULT_DISPATCHER_CONTEXT, Template.DEFAULT_USE_CONTEXT ); new TemplateMapping( template, root, Template.DEFAULT_DISPATCHER_CONTEXT,
Template.DEFAULT_USE_CONTEXT );
} }
public void registerPortalTemplate() { public void registerPortalTemplate() {

4
ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/head.xsl
View File

@ -23,6 +23,10 @@
</meta> </meta>
</xsl:template> </xsl:template>
<!-- The file ~/lib/page.css does not exist at least since version 1.0.2
there exists a file of this name in
ccm-cms/web/__ccm__/static/cms/admin/page/page.css
may be a copy&paste error -->
<xsl:template name="aplaws:headerStyleSheets"> <xsl:template name="aplaws:headerStyleSheets">
<link rel="stylesheet" href="/__ccm__/themes/aplaws/lib/page.css" type="text/css" media="screen"/> <link rel="stylesheet" href="/__ccm__/themes/aplaws/lib/page.css" type="text/css" media="screen"/>
</xsl:template> </xsl:template>

12
ccm-themedirector/src/com/arsdigita/themedirector/Loader.java
View File

@ -42,6 +42,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
new KernelExcursion() { new KernelExcursion() {
public void excurse() { public void excurse() {
setEffectiveParty(Kernel.getSystemParty()); setEffectiveParty(Kernel.getSystemParty());
setupThemeDirector(); setupThemeDirector();
} }
}.run(); }.run();
@ -49,7 +50,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
/** /**
* Creates theme manager as a legacy-free application type. * Creates theme director as a legacy-free application type.
* *
* NOTE: The wording in the title parameter of ApplicationType determines * NOTE: The wording in the title parameter of ApplicationType determines
* the name of the subdirectory for the XSL stylesheets. * the name of the subdirectory for the XSL stylesheets.
@ -63,13 +64,6 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
*/ */
private void setupThemeDirector() { private void setupThemeDirector() {
// create application type
// legacy compatible style of creation
// ApplicationType type = ApplicationType.createApplicationType(
// "themedirector",
// "CCM Themes Administration",
// ThemeDirector.BASE_DATA_OBJECT_TYPE);
// EXPERIMENTAL legacy free style of creation
ApplicationType type = ApplicationType type =
new ApplicationType( "Theme Director", new ApplicationType( "Theme Director",
ThemeDirector.BASE_DATA_OBJECT_TYPE ); ThemeDirector.BASE_DATA_OBJECT_TYPE );
@ -78,7 +72,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
Application admin = Application.retrieveApplicationForPath("/admin/"); Application admin = Application.retrieveApplicationForPath("/admin/");
// create application instance as a legacy compatible app // create application instance as a legacy free app.
// Whether a legacy compatible or a legacy free application is // Whether a legacy compatible or a legacy free application is
// created depends on the type of ApplicationType above. No need to // created depends on the type of ApplicationType above. No need to
// modify anything here // modify anything here

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

@ -53,7 +53,8 @@ import java.util.Iterator;
import java.util.Set; import java.util.Set;
/** /**
* Loader. * <p>Loader executes nonrecurring at install time and loads (installs and
* initializes) the APLAWS integration module persistently into database.</p>
* *
* Creates category domains in the terms application according to * Creates category domains in the terms application according to
* configuration files and adds jsp templates to navigation. * configuration files and adds jsp templates to navigation.

1
environment/project.xml.gen-dev
View File

@ -62,7 +62,6 @@
<!-- - - - - - - --> <!-- - - - - - - -->
<!-- <ccm:application name="ccm-auth-http"/> --> <!-- <ccm:application name="ccm-auth-http"/> -->
<!-- <ccm:application name="ccm-bookmarks"/> --> <!-- <ccm:application name="ccm-bookmarks"/> -->
<!-- temporarily excluded, produces errors in the build process -->
<ccm:application name="ccm-docmgr"/> <ccm:application name="ccm-docmgr"/>
<!-- <ccm:application name="ccm-formbuilder-pdf"/> --> <!-- <ccm:application name="ccm-formbuilder-pdf"/> -->
<ccm:application name="ccm-forum"/> <ccm:application name="ccm-forum"/>

107
environment/project.xml.gen-dev-pb 100644
View File

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- project.xml -dev- containing only those modules used for
generic development -->
<ccm:project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ccm="http://ccm.redhat.com/ccm-project"
ccmVersion="6.1"
name="aplaws-gen"
prettyName="APLAWS plus"
version="1-1-2"
release="alpha-1"
webxml="web.xml-aplaws"
webapp="ROOT"
xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
<ccm:databases>
<ccm:database name="postgres"/>
</ccm:databases>
<ccm:build>
<!-- Main apps -->
<!-- - - - - - -->
<ccm:application name="ccm-core"/>
<ccm:application name="ccm-cms"/>
<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"/>
<!-- <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-bookmark"/>
<!-- <ccm:application name="ccm-cms-types-contact"/> -->
<!-- <ccm:application name="ccm-cms-types-esdservice"/> -->
<ccm:application name="ccm-cms-types-event"/>
<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-glossaryitem"/>
<!-- <ccm:application name="ccm-cms-types-htmlform"/> -->
<!-- <ccm:application name="ccm-cms-types-inlinesite"/> -->
<!-- <ccm:application name="ccm-cms-types-job"/> -->
<!-- <ccm:application name="ccm-cms-types-legalnotice"/> -->
<ccm:application name="ccm-cms-types-member"/>
<!-- <ccm:application name="ccm-cms-types-minutes"/> -->
<!-- <ccm:application name="ccm-cms-types-motditem"/> -->
<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-pressrelease"/> -->
<!-- <ccm:application name="ccm-cms-types-service"/> -->
<!-- Fuer OpenCCM aktivieren: -->
<!-- <ccm:application name="ccm-cms-types-siteproxy"/> -->
<!-- <ccm:application name="ccm-cms-types-xmlfeed"/> -->
<!-- Applications -->
<!-- - - - - - - -->
<!-- <ccm:application name="ccm-auth-http"/> -->
<!-- <ccm:application name="ccm-bookmarks"/> -->
<ccm:application name="ccm-docmgr"/>
<!-- <ccm:application name="ccm-formbuilder-pdf"/> -->
<ccm:application name="ccm-forum"/>
<!-- <ccm:application name="ccm-forum-categorised"/> -->
<ccm:application name="ccm-portalserver"/>
<ccm:application name="ccm-portalworkspace"/>
<!-- <ccm:application name="ccm-simplesurvey"/> -->
<ccm:application name="ccm-themedirector"/>
<!-- <ccm:application name="ccm-user-preferences"/> -->
<!-- <ccm:application name="ccm-weblog"/> -->
<!-- <ccm:application name="ccm-webpage"/> -->
<!-- LDN extension -->
<!-- - - - - - - - -->
<!-- <ccm:application name="ccm-ldn-aplaws"/> -->
<!-- <ccm:application name="ccm-ldn-atoz"/> -->
<!-- <ccm:application name="ccm-ldn-dublin"/> -->
<!-- <ccm:application name="ccm-ldn-exporter"/> -->
<!-- <ccm:application name="ccm-ldn-freeform"/> -->
<!-- <ccm:application name="ccm-ldn-importer"/> -->
<ccm:application name="ccm-ldn-navigation"/>
<!-- <ccm:application name="ccm-ldn-rss"/> -->
<ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/>
<ccm:application name="ccm-ldn-terms"/>
<ccm:application name="ccm-ldn-util"/>
<!-- GEN extension -->
<!-- - - - - - - - -->
<ccm:application name="ccm-gen-aplaws"/>
<!-- tools will be downloaded from trunk, but does not
contain java code to be compiled!
<ccm:application name="tools"/> -->
</ccm:build>
</ccm:project>