diff --git a/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java b/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java
index 070a80ff6..e42774d0f 100755
--- a/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java
+++ b/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java
@@ -22,16 +22,16 @@ import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.ParameterModel;
/**
- * A class
- * representing an HTML SELECT element with
- * a single selection.
+ * A class representing an HTML SELECT element with
+ * a single selection.
*
* @author Karl Goldstein
* @author Uday Mathur
* @author Rory Solomon
* @author Michael Pih
* @author Christian Brechbü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;
}
diff --git a/ccm-core/src/com/arsdigita/ui/UIConfig.java b/ccm-core/src/com/arsdigita/ui/UIConfig.java
index 8781d9f57..bb7889fd7 100644
--- a/ccm-core/src/com/arsdigita/ui/UIConfig.java
+++ b/ccm-core/src/com/arsdigita/ui/UIConfig.java
@@ -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
*/
diff --git a/ccm-core/src/com/arsdigita/web/Application.java b/ccm-core/src/com/arsdigita/web/Application.java
index 452251641..0430827bb 100755
--- a/ccm-core/src/com/arsdigita/web/Application.java
+++ b/ccm-core/src/com/arsdigita/web/Application.java
@@ -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,13 +494,23 @@ public class Application extends Resource {
return children;
}
+ /**
+ *
+ * @param applicationType
+ * @return
+ */
public ApplicationCollection getChildApplicationsForType
- (String applicationType) {
+ (String applicationType) {
ApplicationCollection children = getChildApplications();
children.addEqualsFilter("objectType", applicationType);
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) {
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
index a4ae7d896..088879741 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
@@ -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
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
index ebe86e179..f5a31e42d 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
@@ -36,7 +36,6 @@
-
@@ -45,6 +44,7 @@
+
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
index 007180310..86c81c486 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
@@ -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
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index 383dc83d5..05109344c 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -70,7 +70,6 @@
-
@@ -82,6 +81,7 @@
+
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
index be33a3367..6529b9554 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
@@ -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
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index 5dc0fd30a..6331a2ef6 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -81,13 +81,13 @@
-
+
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
index 4c4b15ab9..3fe2e09f9 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
@@ -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
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
index 52f11d94d..62d5d5cd8 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
@@ -53,6 +53,7 @@
+
@@ -65,7 +66,6 @@
-
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
index cddc46432..67887c996 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
@@ -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
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
index 27e00c488..d5a2ba296 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
@@ -53,13 +53,13 @@
-
+
diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java
index c23ada2e9..8c75550ab 100755
--- a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java
+++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java
@@ -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()