diff --git a/ccm-core/src/com/arsdigita/domain/DomainQuery.java b/ccm-core/src/com/arsdigita/domain/DomainQuery.java
index 5283f3a8c..0131d83b3 100755
--- a/ccm-core/src/com/arsdigita/domain/DomainQuery.java
+++ b/ccm-core/src/com/arsdigita/domain/DomainQuery.java
@@ -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 DataQuery.
+ * This is the base class that all other domain query classes would extend.
+ * It provides a facade on to a contained DataQuery.
*
* @see com.arsdigita.persistence.DataQuery
*
diff --git a/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java b/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java
index ef794a3ae..bdf2a47f9 100755
--- a/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java
+++ b/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java
@@ -97,23 +97,27 @@ import org.apache.log4j.Logger;
*
* Persistence Details: The default constructor of
* ACSObjectSelectionModel 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 ACSObjectSelectionModel 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 ACSObjectSelectionModel
+ * to manually instantiate the objects:
*
- *
ACSObjectSelectionModel model = new ACSObjectSelectionModel("com.arsdigita.cms.Article", "com.arsdigita.cms.Article", "item_id");
+ *
+ * ACSObjectSelectionModel model =
+ * new ACSObjectSelectionModel("com.arsdigita.cms.Article",
+ * "com.arsdigita.cms.Article", "item_id");
+ *
*
- * In this case, the model will attempt to use reflection to instantiate the correct
- * subclass of ACSObject. In addition, the supplementary
+ * In this case, the model will attempt to use reflection to instantiate the
+ * correct subclass of ACSObject. 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 );
}
}
diff --git a/ccm-core/src/log4j.properties b/ccm-core/src/log4j.properties
index 42d3a852c..261f1c1f4 100755
--- a/ccm-core/src/log4j.properties
+++ b/ccm-core/src/log4j.properties
@@ -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
diff --git a/ccm-forum/doc/semantic-XML-plan.txt b/ccm-forum/doc/semantic-XML-plan.txt
index 826e90e0d..9d26f695b 100755
--- a/ccm-forum/doc/semantic-XML-plan.txt
+++ b/ccm-forum/doc/semantic-XML-plan.txt
@@ -67,7 +67,7 @@ bebop List or Table class:
This generates XML looking like:
-