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

Nachhalten Installationsanpassungen. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1336 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-12-13 16:09:50 +00:00
parent 9938a6d4e8
commit 3e434c250e
14 changed files with 86 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java
View File

@ -22,8 +22,7 @@ import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.ParameterModel;
/**
* A class
* representing an HTML <code>SELECT</code> element with
* A class representing an HTML <code>SELECT</code> element with
* a single selection.
*
* @author Karl Goldstein
@ -31,7 +30,8 @@ import com.arsdigita.bebop.parameters.ParameterModel;
* @author Rory Solomon
* @author Michael Pih
* @author Christian Brechb&uuml;hler (christian@arsdigita.com)
* @version $Id: SingleSelect.java 287 2005-02-22 00:29:02Z sskracic $ */
* @version $Id: SingleSelect.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class SingleSelect extends Select {
/** The XML tag.
@ -67,6 +67,7 @@ public class SingleSelect extends Select {
/** State that this is a single select
* @return false
*/
@Override
public boolean isMultiple() {
return false;
}

5
ccm-core/src/com/arsdigita/ui/UIConfig.java
View File

@ -241,7 +241,10 @@ public class UIConfig extends AbstractConfig {
}
/**
* Retrieve systems root page (entry page) url.
* Retrieve the site's root page url - i.e. the front page, the
* (usually public) top level entry page for the site.
* By default it is the login page, but usually the root page of the main
* presentation application, e.g. portal, navigation, forum, etc.
*
* @return root page url
*/

55
ccm-core/src/com/arsdigita/web/Application.java
View File

@ -247,7 +247,9 @@ public class Application extends Resource {
final Application parent,
final boolean createContainerGroup) {
final Application app = (Application) Resource.createResource(type, title, parent);
final Application app = (Application) Resource.createResource(type,
title,
parent);
if (createContainerGroup) {
app.createGroup();
}
@ -444,6 +446,10 @@ public class Application extends Resource {
}
// COMPAT XXX
/**
* @deprecated refactor not using deprecated class PackageType. Use
* ApplicationType instead
*/
public PackageType getPackageType() {
return getApplicationType().getPackageType();
}
@ -488,6 +494,11 @@ public class Application extends Resource {
return children;
}
/**
*
* @param applicationType
* @return
*/
public ApplicationCollection getChildApplicationsForType
(String applicationType) {
ApplicationCollection children = getChildApplications();
@ -495,6 +506,11 @@ public class Application extends Resource {
return children;
}
/**
*
* @return
* @deprecated refactor to use other methods of class aüpplication instead
*/
private PackageInstance getPackageInstance() {
DataObject dataObject = (DataObject) get("packageInstance");
@ -503,13 +519,23 @@ public class Application extends Resource {
return new PackageInstance(dataObject);
}
/**
*
* @return
* @deprecated refactor to use other methods of class aüpplication instead
*/
private void setPackageInstance(PackageInstance packageInstance) {
Assert.exists(packageInstance, PackageInstance.class);
setAssociation("packageInstance", packageInstance);
}
// Can return null. XXX Needs to be getSiteNodes instead.
/**
*
* Needs to be getSiteNodes instead.
* @return Can return null.
* @deprecated
*/
public SiteNode getSiteNode() {
DataObject packageInstance = (DataObject)get("packageInstance");
@ -629,10 +655,16 @@ public class Application extends Resource {
return getApplicationType().getRelevantPrivileges();
}
/**
* Retrieve all installed applications (portlets excluded).
* @return a collection of installed
*/
public static ApplicationCollection retrieveAllApplications() {
DataCollection dataCollection =
SessionManager.getSession().retrieve(BASE_DATA_OBJECT_TYPE);
// exclude all portlets (no application at all) and portal panes
// (no application but sort of "sub-application").
dataCollection.addEqualsFilter
("resourceType.hasFullPageView", Boolean.TRUE);
@ -641,6 +673,25 @@ public class Application extends Resource {
return apps;
}
/**
* Retrieve all installed applications (portlets excluded).
* @return a collection of installed
*/
public static ApplicationCollection retrieveAllApplications(String
applicationType) {
DataCollection dataCollection = SessionManager.getSession()
.retrieve(BASE_DATA_OBJECT_TYPE);
// exclude all portlets (no application at all) and portal panes
// (no application but sort of "sub-application").
dataCollection.addEqualsFilter
("resourceType.hasFullPageView", Boolean.TRUE);
dataCollection.addEqualsFilter("objectType", applicationType);
ApplicationCollection apps = new ApplicationCollection(dataCollection);
return apps;
}
public static boolean isInstalled (String applicationObjectType,
String path) {

2
ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
View File

@ -47,7 +47,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
; Configure dhtml editor for use in cms content-center
; Xinha is default and should work out of the box

2
ccm-ldn-aplaws/bundles/custom/cfg/project.xml
View File

@ -36,7 +36,6 @@
<ccm:application name="ccm-ldn-aplaws"/>
<ccm:application name="ccm-ldn-atoz"/>
<ccm:application name="ccm-ldn-dublin"/>
<ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/>
<ccm:application name="ccm-ldn-rss"/>
@ -45,6 +44,7 @@
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-search"/>
<ccm:application name="ccm-themedirector"/>

2
ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
View File

@ -47,7 +47,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
; Configure dhtml editor for use in cms content-center
; Xinha is default and should work out of the box

2
ccm-ldn-aplaws/bundles/demo/cfg/project.xml
View File

@ -70,7 +70,6 @@
<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"/>
@ -82,6 +81,7 @@
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalserver"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-subsite"/>
<ccm:application name="ccm-themedirector"/>

2
ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
View File

@ -48,7 +48,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
; Configure dhtml editor for use in cms content-center
; Xinha is default and should work out of the box

2
ccm-ldn-aplaws/bundles/devel/cfg/project.xml
View File

@ -81,13 +81,13 @@
<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"/>
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalserver"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-subsite"/>
<!-- Currently broken.
Missing file: ccm-portlet/postgres-create.sql
<ccm:application name="ccm-portlet"/> -->

2
ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
View File

@ -47,7 +47,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.dispatcher.SubsiteItemTemplateResolver
; Configure dhtml editor for use in cms content-center
; Xinha is default and should work out of the box

2
ccm-ldn-aplaws/bundles/extended/cfg/project.xml
View File

@ -53,6 +53,7 @@
<ccm:application name="ccm-forum"/>
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-subsite"/>
<ccm:application name="ccm-themedirector"/>
<!-- ldn extensions (LAW functionality) -->
@ -65,7 +66,6 @@
<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"/>

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

@ -47,7 +47,7 @@ com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCatego
com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
; Configure dhtml editor for use in cms content-center
; Xinha is default and should work out of the box

2
ccm-ldn-aplaws/bundles/standard/cfg/project.xml
View File

@ -53,13 +53,13 @@
<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"/>
<!-- Extra apps -->
<ccm:application name="ccm-forum"/>
<ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-subsite"/>
<ccm:application name="ccm-themedirector"/>

13
ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java
View File

@ -29,12 +29,25 @@ import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.SessionManager;
/**
*
*
*/
public class RootCategoryPicker extends AbstractCategoryPicker {
/**
*
* @param name
*/
public RootCategoryPicker(String name) {
super(name);
}
/**
*
* @param state
* @param target
*/
protected void addOptions(PageState state,
SingleSelect target) {
DataCollection domains = SessionManager.getSession()