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

Nachhalten der Änderungen in subsite in allgemeinen Modulen, verschiedene Formatierungen, Dokumentation. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1333 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-12-11 13:28:33 +00:00
parent 95a8856bf0
commit b48d60cd60
13 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-core/src/com/arsdigita/domain/DomainQuery.java
View File

@ -27,8 +27,8 @@ import com.arsdigita.persistence.metadata.CompoundType;
import java.util.Map;
/**
* This is the base class that all other domain query classes
* would extend. It provides a facade on to a contained <code>DataQuery</code>.
* This is the base class that all other domain query classes would extend.
* It provides a facade on to a contained <code>DataQuery</code>.
*
* @see com.arsdigita.persistence.DataQuery
*

45
ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java
View File

@ -97,23 +97,27 @@ import org.apache.log4j.Logger;
* <p>
* <b>Persistence Details:</b> The default constructor of
* <code>ACSObjectSelectionModel</code> will attempt to use the
* {@link DomainObjectFactory} to automatically instantiate the correct Java subclass
* of {@link ACSObject}. However, it is also possible to use an alternate constructor
* in order to force the <code>ACSObjectSelectionModel</code> to manually instantiate
* the objects:
* {@link DomainObjectFactory} to automatically instantiate the correct Java
* subclass of {@link ACSObject}. However, it is also possible to use an
* alternate constructor in order to force the <code>ACSObjectSelectionModel</code>
* to manually instantiate the objects:
*
* <blockquote><pre><code>ACSObjectSelectionModel model = new ACSObjectSelectionModel("com.arsdigita.cms.Article", "com.arsdigita.cms.Article", "item_id");</code></pre></blockquote>
* <blockquote><pre><code>
* ACSObjectSelectionModel model =
* new ACSObjectSelectionModel("com.arsdigita.cms.Article",
* "com.arsdigita.cms.Article", "item_id");
* </code></pre></blockquote>
*
* In this case, the model will attempt to use reflection to instantiate the correct
* subclass of <code>ACSObject</code>. In addition, the supplementary
* In this case, the model will attempt to use reflection to instantiate the
* correct subclass of <code>ACSObject</code>. In addition, the supplementary
* constructor makes it possible to create new objects in the database
* using the {@link #createACSObject(BigDecimal)} method.
*
* @version $Id: ACSObjectSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $
* @author Stanislav Freidin
* @see com.arsdigita.bebop.SingleSelectionModel
* @see com.arsdigita.bebop.ParameterSingleSelectionModel
*
* @author Stanislav Freidin
* @version $Id: ACSObjectSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $
*/
public class ACSObjectSelectionModel implements DomainObjectSelectionModel {
@ -178,9 +182,9 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel {
* @param parameterName The name of the state parameter which will
* be used to store the object ID.
*/
public ACSObjectSelectionModel(
String javaClass, String objectType, String parameterName
) {
public ACSObjectSelectionModel( String javaClass,
String objectType,
String parameterName ) {
this(javaClass, objectType, new BigDecimalParameter(parameterName));
}
@ -197,9 +201,9 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel {
* @param parameter The state parameter which should be used to store
* the object ID
*/
public ACSObjectSelectionModel(
String javaClass, String objectType, BigDecimalParameter parameter
) {
public ACSObjectSelectionModel( String javaClass,
String objectType,
BigDecimalParameter parameter ) {
this(javaClass, objectType,
new ParameterSingleSelectionModel(parameter));
}
@ -217,9 +221,9 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel {
* @param model The {@link SingleSelectionModel} which will supply
* a {@link BigDecimal} ID of the currently selected object
*/
public ACSObjectSelectionModel(
String javaClass, String objectType, SingleSelectionModel model
) {
public ACSObjectSelectionModel( String javaClass,
String objectType,
SingleSelectionModel model ) {
m_loaded = new RequestLocal() {
protected Object initialValue(PageState state) {
return Boolean.FALSE;
@ -232,9 +236,8 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel {
m_javaClass = Class.forName(javaClass);
m_constructor = m_javaClass.getConstructor(new Class[]{OID.class});
} catch (Exception e) {
throw new UncheckedWrapperException(
"Problem loading class " + javaClass, e
);
throw new UncheckedWrapperException( "Problem loading class "
+ javaClass, e );
}
}

2
ccm-core/src/log4j.properties
View File

@ -167,7 +167,6 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO
#com.arsdigita.london.rss.RSSService=DEBUG
#com.arsdigita.london.search.Search=DEBUG
#com.arsdigita.london.shortcuts.Shortcuts=DEBUG
#com.arsdigita.london.subsite.Subsite=DEBUG
#kea.stemmers.LovinsStemmer=DEBUG
#kea.stemmers.StopwordsFrench=DEBUG
#kea.stemmers.StopwordsSpanish=DEBUG
@ -182,3 +181,4 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO
#com.arsdigita.cms.contenttypes.SciMember=DEBUG
#com.arsdigita.cms.webpage.installer.Initializer=DEBUG
#com.arsdigita.subsite.Subsite=DEBUG

4
ccm-forum/doc/semantic-XML-plan.txt
View File

@ -67,7 +67,7 @@ bebop List or Table class:
This generates XML looking like:
<subsite:siteListing>
<object oid="[com.arsdigita.london.subsite.Site:{id=30008}]">
<object oid="[com.arsdigita.subsite.Site:{id=30008}]">
<id>30008</id>
<title>Another Site</title>
<description>Some other stuff</description>
@ -80,7 +80,7 @@ This generates XML looking like:
<primaryURL>/portal/some.example.com/</primaryURL>
</frontPage>
</object>
<object oid="[com.arsdigita.london.subsite.Site:{id=32018}]">
<object oid="[com.arsdigita.subsite.Site:{id=32018}]">
<id>32018</id>
<title>My Site</title>
<description>Some stuff</description>

2
ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
View File

@ -31,7 +31,7 @@ import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.portalworkspace.WorkspacePageCollection;
import com.arsdigita.london.subsite.Subsite;
import com.arsdigita.subsite.Subsite;
import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException;

6
ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java
View File

@ -24,9 +24,9 @@ import com.arsdigita.categorization.Category;
import com.arsdigita.cms.ContentType;
import com.arsdigita.domain.DomainCollection;
import com.arsdigita.navigation.DataCollectionDefinition;
import com.arsdigita.london.subsite.Site;
import com.arsdigita.london.subsite.Subsite;
import com.arsdigita.london.subsite.SubsiteContext;
import com.arsdigita.subsite.Site;
import com.arsdigita.subsite.Subsite;
import com.arsdigita.subsite.SubsiteContext;
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataObject;

1
ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
View File

@ -75,6 +75,7 @@ public class Workspace extends Application {
/** Config object containing various parameter */
private static final WorkspaceConfig s_config = WorkspaceConfig.getConfig();
/** Service method to provide client classes access to configuration. */
public static WorkspaceConfig getConfig() {
return s_config;
}

11
ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java
View File

@ -26,19 +26,17 @@ import com.arsdigita.web.Application;
import com.arsdigita.web.Web;
/**
* This selection model has a default value which will be return when nothing is
* selected.
* This selection model adds an (optional?) default value which will be returned
* when nothing is selected.
*/
public class ApplicationSelectionModel extends ACSObjectSelectionModel {
// public static final BigDecimalParameter PARAM =
// (BigDecimalParameter)PermissionsPane.getObjectIDParam();
public static final String DEFAULT_PARAM_NAME = "app_id";
private boolean m_hasDefaultValue;
/** Creates a s_logging category with name = full name of class */
private static final Logger s_log = Logger
.getLogger(ApplicationSelectionModel.class);
@ -112,6 +110,7 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel {
* Override ACSObjectSelectionModel methods to default to the default
* Application
*/
@Override
public boolean isSelected(PageState state) {
if (m_hasDefaultValue && !super.isSelected(state)) {
return (getDefaultApplication() != null);
@ -124,6 +123,7 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel {
* @param state
* @return
*/
@Override
public DomainObject getSelectedObject(PageState state) {
if (m_hasDefaultValue && !super.isSelected(state)) {
return getDefaultApplication();
@ -137,6 +137,7 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel {
* @param state
* @return
*/
@Override
public Object getSelectedKey(PageState state) {
if (m_hasDefaultValue && !super.isSelected(state)) {
return getDefaultApplication();

7
ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java
View File

@ -29,7 +29,7 @@ import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.GridPanel;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.List;
import com.arsdigita.bebop.Page;
// import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.bebop.SimpleContainer;
@ -48,10 +48,10 @@ import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.form.Submit;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.parameters.NotEmptyValidationListener;
import com.arsdigita.domain.DomainObject;
// import com.arsdigita.domain.DomainObject;
import com.arsdigita.kernel.Group;
import com.arsdigita.kernel.PartyCollection;
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
// import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelExcursion;
import com.arsdigita.kernel.Role;
@ -70,6 +70,7 @@ import com.arsdigita.portalworkspace.ui.ParticipantBrowsePane;
import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.london.util.ui.DomainObjectSelectionModel;
import com.arsdigita.persistence.OID;
//?
import com.arsdigita.toolbox.ui.ACSObjectCollectionListModel;
import com.arsdigita.toolbox.ui.IteratorListModel;

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

@ -32,6 +32,7 @@ import org.apache.log4j.Logger;
* Loader.
*
* @author Randy Graebner &lt;randyg@redhat.com&gt;
* @author Peter Boy &lt;pboy@barkhof.uni-bremen.de&gt;
* @version $Id: Loader.java 2004 2009-10-03 22:23:08Z pboy $
*/
public class Loader extends PackageLoader implements ThemeDirectorConstants {
@ -59,8 +60,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants {
* to lower case.
* Example: "Theme Director" will become "theme-director".
*
* Creates an entry in table application_types and a corresponding entry in
* apm_package_types
* Creates an entry in table application_types
*/
private void setupThemeDirector() {

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

@ -31,6 +31,7 @@ import org.apache.log4j.Logger;
*/
public class ThemeDirector extends Application {
/** A logger instance, primarily to assist debugging . */
private static final Logger s_log = Logger.getLogger(ThemeDirector.class);
public static final String DEFAULT_THEME = "defaultTheme";
@ -38,14 +39,11 @@ public class ThemeDirector extends Application {
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.themedirector.ThemeDirector";
public static ThemeDirectorConfig s_config = new ThemeDirectorConfig();
static {
s_log.debug("Static initalizer starting...");
s_config.load();
s_log.debug("Static initalizer finished.");
}
/** Config object containing various parameter */
private static final ThemeDirectorConfig s_config =
ThemeDirectorConfig.getConfig();
/** Service method to provide clients access to configuration. */
public static ThemeDirectorConfig getConfig() {
return s_config;
}

2
ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp
View File

@ -4,7 +4,7 @@
<%@ page import = "com.arsdigita.web.LoginSignal" %>
<%@ page import = "org.apache.log4j.Logger" %>
<%@ page import = "com.arsdigita.dispatcher.AccessDeniedException" %>
<%@ page import = "com.arsdigita.london.subsite.Site" %>
<%@ page import = "com.arsdigita.subsite.Site" %>
<%@ page import = "java.math.BigDecimal" %>
<%@ page import = "com.arsdigita.domain.DataObjectNotFoundException" %>
<%@ page import = "com.arsdigita.persistence.SessionManager" %>

2
ccm-themedirector/web/themes/static/default/subsite-index.xsl
View File

@ -3,6 +3,6 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0" >
<xsl:import href="../../../../ccm-ldn-subsite/__ccm__/apps/subsite/xsl/index.xsl"/>
<xsl:import href="../../heirloom/apps/subsite/xsl/index.xsl"/>
</xsl:stylesheet>