From 0062abb30f184912c0f4f4bef74c3325bfb28a38 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sat, 24 Apr 2010 21:17:40 +0000
Subject: [PATCH] diverser Kleinkram

git-svn-id: https://svn.libreccm.org/ccm/trunk@387 8810af33-2d31-482b-a856-94f89814c4df
---
 .../london/navigation/NavigationConfig.java       |  2 +-
 .../src/com/arsdigita/aplaws/Loader.java          | 15 ++++++++-------
 .../src/com/arsdigita/cms/webpage/Webpage.java    | 11 +++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java
index 94bbb5a66..551533299 100755
--- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java
+++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java
@@ -39,7 +39,7 @@ import com.arsdigita.util.parameter.ResourceParameter;
 import com.arsdigita.web.Application;
 
 import java.io.InputStream;
-import java.io.IOException;
+// import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/ccm-shp-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-shp-aplaws/src/com/arsdigita/aplaws/Loader.java
index 07537c6ff..62c730813 100755
--- a/ccm-shp-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-shp-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -37,19 +37,19 @@ import com.arsdigita.kernel.RoleCollection;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.runtime.ScriptContext;
-import com.arsdigita.util.Assert;
-import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.util.parameter.BooleanParameter;
+//import com.arsdigita.util.Assert;
+//import com.arsdigita.util.UncheckedWrapperException;
+//import com.arsdigita.util.parameter.BooleanParameter;
 import com.arsdigita.util.parameter.Parameter;
 import com.arsdigita.util.parameter.StringParameter;
-import com.arsdigita.util.parameter.URLParameter;
+// import com.arsdigita.util.parameter.URLParameter;
 import com.arsdigita.web.Application;
 
 import org.apache.log4j.Logger;
 
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.util.Date;
+//import java.net.URL;
+//import java.net.MalformedURLException;
+//import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -152,6 +152,7 @@ public class Loader extends PackageLoader {
 
         String navigationKey = (String)get(m_navigationDomain);
         registerDomain(navigationKey, "/navigation/", null);
+        // registerDomain(navigationKey, "/public/", null);
         registerDomain(navigationKey, "/content/", null);
         registerDomain(navigationKey, "/portal/", null);
         //registerDomain(navigationKey, "/atoz/", null);
diff --git a/ccm-webpage/src/com/arsdigita/cms/webpage/Webpage.java b/ccm-webpage/src/com/arsdigita/cms/webpage/Webpage.java
index e6914deb2..6320edd79 100755
--- a/ccm-webpage/src/com/arsdigita/cms/webpage/Webpage.java
+++ b/ccm-webpage/src/com/arsdigita/cms/webpage/Webpage.java
@@ -4,17 +4,28 @@ import com.arsdigita.cms.util.GlobalizationUtil;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
+import com.arsdigita.cms.ContentBundle;
+import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.cms.Folder;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.domain.DomainObjectXMLRenderer;
+import com.arsdigita.kernel.ACSObject;
+import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.KernelExcursion;
+import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.User;
 import com.arsdigita.persistence.DataObject;
+import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.persistence.OID;
+import com.arsdigita.persistence.PersistenceException;
+import com.arsdigita.persistence.SessionManager;
 //import com.arsdigita.search.Searchable;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.util.StringUtils;
+import com.arsdigita.xml.Element;
 
 import java.math.BigDecimal;
 import java.net.URL;