[Aplaws-commit] r2471 - in trunk/ccm-ldn-aplaws: src/com/arsdigita/aplaws web/templates/ccm-cms/content-section/default web/templates/ccm-navigation/navigation

[<pb...@fe...>]

Author: pboy
Date: 2013-02-02 18:41:44 +0000 (Sat, 02 Feb 2013)
New Revision: 2471

Modified:
   trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
   trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
   trunk/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
   trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
   trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp
Log:
Fixed various outdated class paths in JSP. 

Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java	2013-02-02 18:40:36 UTC (rev 2470)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java	2013-02-02 18:41:44 UTC (rev 2471)
@@ -18,8 +18,8 @@
 package com.arsdigita.aplaws;
 
 import com.arsdigita.runtime.AbstractConfig;
+import com.arsdigita.util.parameter.BooleanParameter;
 import com.arsdigita.util.parameter.Parameter;
-import com.arsdigita.util.parameter.BooleanParameter;
 import com.arsdigita.util.parameter.StringParameter;
 
 import org.apache.log4j.Logger;

Modified: trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
===================================================================
--- trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java	2013-02-02 18:40:36 UTC (rev 2470)
+++ trunk/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java	2013-02-02 18:41:44 UTC (rev 2471)
@@ -27,6 +27,11 @@
 import com.arsdigita.kernel.RoleCollection;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.loader.PackageLoader;
+import com.arsdigita.london.terms.Domain;
+import com.arsdigita.london.terms.importer.Parser;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.Template;
+import com.arsdigita.navigation.TemplateMapping;
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.runtime.ScriptContext;
 import com.arsdigita.util.Assert;
@@ -37,12 +42,6 @@
 import com.arsdigita.util.parameter.URLParameter;
 import com.arsdigita.web.Application;
 
-import com.arsdigita.navigation.Navigation;
-import com.arsdigita.navigation.Template;
-import com.arsdigita.navigation.TemplateMapping;
-import com.arsdigita.london.terms.Domain;
-import com.arsdigita.london.terms.importer.Parser;
-
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.Date;

Modified: trunk/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp
===================================================================
--- trunk/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp	2013-02-02 18:40:36 UTC (rev 2470)
+++ trunk/ccm-ldn-aplaws/web/templates/ccm-cms/content-section/default/aplaws-item.jsp	2013-02-02 18:41:44 UTC (rev 2471)
@@ -33,7 +33,7 @@
       classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
     <define:component name="assignedTerms"
-      classname="com.arsdigita.bundle.ui.AssignedItemTerms"/>
+      classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
   </define:page>
 
   <show:all/>

Modified: trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp
===================================================================
--- trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp	2013-02-02 18:40:36 UTC (rev 2470)
+++ trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-portal.jsp	2013-02-02 18:41:44 UTC (rev 2471)
@@ -5,7 +5,7 @@
   version="1.2">
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
   <jsp:directive.page import="com.arsdigita.portalworkspace.ui.CategoryPortalSelectionModel"/>
 
@@ -22,11 +22,11 @@
     title="Navigation" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="portalWorkspace"
-      classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/>
+      classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
     <jsp:scriptlet>
       ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
     </jsp:scriptlet>

Modified: trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp
===================================================================
--- trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp	2013-02-02 18:40:36 UTC (rev 2470)
+++ trunk/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/aplaws-services.jsp	2013-02-02 18:41:44 UTC (rev 2471)
@@ -6,9 +6,9 @@
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -23,25 +23,25 @@
     title="Navigation" cache="true">
 
     <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="categoryTermDetails"
       classname="com.arsdigita.aplaws.ui.CategoryTermDetails"/>
     <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.AtoZObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
 
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
       
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.london.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
     </jsp:scriptlet>
   </define:page>