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

diverser Kleinkram 

git-svn-id: https://svn.libreccm.org/ccm/trunk@387 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2010-04-24 21:17:40 +00:00
parent 5591d8cd99
commit 0062abb30f
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-ldn-navigation/src/com/arsdigita/london/navigation/NavigationConfig.java
View File

@ -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;

15
ccm-shp-aplaws/src/com/arsdigita/aplaws/Loader.java
View File

@ -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);

11
ccm-webpage/src/com/arsdigita/cms/webpage/Webpage.java
View File

@ -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;