Zwischenstand AtoZ.
git-svn-id: https://svn.libreccm.org/ccm/trunk@1600 8810af33-2d31-482b-a856-94f89814c4dfmaster
pb
parent
6bfbd86e2b
commit
67e4b32734
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
|
||||
version="2.4">
|
||||
|
||||
<!-- module ccm-atoz - servlet declarations BEGIN -->
|
||||
<servlet>
|
||||
<servlet-name>atoz-files</servlet-name>
|
||||
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>template-path</param-name>
|
||||
<param-value>/templates/ccm-atoz</param-value>
|
||||
</init-param>
|
||||
</servlet>
|
||||
<!-- module ccm-atoz - servlet declarations END -->
|
||||
|
||||
<!-- module ccm-atoz - servlet mappings BEGIN -->
|
||||
<servlet-mapping>
|
||||
<servlet-name>atoz-files</servlet-name>
|
||||
<url-pattern>/ccm-atoz/files/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
<!-- module ccm-atoz - servlet mappings END -->
|
||||
|
||||
</web-app>
|
||||
|
|
@ -27,7 +27,7 @@ import com.arsdigita.atoz.AtoZ;
|
|||
import com.arsdigita.atoz.AtoZProvider;
|
||||
import com.arsdigita.atoz.siteproxy.AtoZSiteProxyProvider;
|
||||
import com.arsdigita.atoz.ui.admin.ProviderForm;
|
||||
import com.arsdigita.london.util.ui.CategoryPicker;
|
||||
import com.arsdigita.categorization.ui.CategoryPicker;
|
||||
import com.arsdigita.util.Classes;
|
||||
|
||||
public class SiteProxyProviderForm extends ProviderForm {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-navigation" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-subsite" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-ldn-aplaws" version="6.6.0" relation="ge"/>
|
||||
<!-- <ccm:requires name="ccm-ldn-aplaws" version="6.6.0" relation="ge"/> -->
|
||||
<ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
|
||||
<ccm:requires name="ccm-ldn-util" version="6.6.0" relation="ge"/>
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
model com.arsdigita.london.atoz;
|
||||
model com.arsdigita.atoz;
|
||||
|
||||
import com.arsdigita.web.Application;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
model com.arsdigita.london.atoz;
|
||||
model com.arsdigita.atoz;
|
||||
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.cms.ContentType;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
model com.arsdigita.london.atoz;
|
||||
model com.arsdigita.atoz;
|
||||
|
||||
import com.arsdigita.cms.ContentItem;
|
||||
import com.arsdigita.kernel.ACSObject;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
model com.arsdigita.london.atoz;
|
||||
model com.arsdigita.atoz;
|
||||
|
||||
import com.arsdigita.categorization.Category;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
model com.arsdigita.london.atoz;
|
||||
model com.arsdigita.atoz;
|
||||
|
||||
import com.arsdigita.kernel.ACSObject;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
model com.arsdigita.london.atoz;
|
||||
model com.arsdigita.atoz;
|
||||
|
||||
query getAllBlackListTypes {
|
||||
String objectType;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
<xrd:property name="/object/rootUseContext/rootCategory"/>
|
||||
</xrd:associations>
|
||||
</xrd:adapter>
|
||||
|
||||
<!--
|
||||
<xrd:adapter objectType="com.arsdigita.london.atoz.terms.DomainProvider">
|
||||
<xrd:attributes rule="exclude">
|
||||
<xrd:property name="/object/id"/>
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
<xrd:property name="/object/displayName"/>
|
||||
</xrd:attributes>
|
||||
</xrd:adapter>
|
||||
|
||||
<xrd:adapter objectType="com.arsdigita.london.atoz.AtoZItemProvider">
|
||||
-->
|
||||
<xrd:adapter objectType="com.arsdigita.atoz.AtoZItemProvider">
|
||||
<xrd:attributes rule="exclude">
|
||||
<xrd:property name="/object/id"/>
|
||||
<xrd:property name="/object/defaultDomainClass"/>
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
<xrd:property name="/object/category"/>
|
||||
</xrd:associations>
|
||||
</xrd:adapter>
|
||||
|
||||
<xrd:adapter objectType="com.arsdigita.london.atoz.AtoZSiteProxyProvider">
|
||||
<!--
|
||||
<xrd:adapter objectType="com.arsdigita.atoz.siteproxy.AtoZSiteProxyProvider">
|
||||
<xrd:attributes rule="exclude">
|
||||
<xrd:property name="/object/id"/>
|
||||
<xrd:property name="/object/defaultDomainClass"/>
|
||||
|
|
@ -71,10 +71,10 @@
|
|||
<xrd:property name="/object/category"/>
|
||||
</xrd:associations>
|
||||
</xrd:adapter>
|
||||
|
||||
-->
|
||||
</xrd:context>
|
||||
|
||||
<xrd:context name="com.arsdigita.london.atoz.ui.admin.CategoryProviderBlackList">
|
||||
<xrd:context name="com.arsdigita.atoz.ui.admin.CategoryProviderBlackList">
|
||||
<xrd:adapter objectType="com.arsdigita.categorization.Category">
|
||||
<xrd:attributes rule="exclude">
|
||||
<xrd:property name="/object/id"/>
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
</xrd:adapter>
|
||||
</xrd:context>
|
||||
|
||||
<xrd:context name="com.arsdigita.london.atoz.ui.admin.CategoryProviderContentTypeBlacklist">
|
||||
<xrd:context name="com.arsdigita.atoz.ui.admin.CategoryProviderContentTypeBlacklist">
|
||||
<xrd:adapter objectType="com.arsdigita.cms.ContentType">
|
||||
<xrd:attributes rule="exclude">
|
||||
<xrd:property name="/object/id"/>
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
</xrd:adapter>
|
||||
</xrd:context>
|
||||
|
||||
<xrd:context name="com.arsdigita.london.atoz.ui.admin.CategoryProviderAliasList">
|
||||
<xrd:context name="com.arsdigita.atoz.ui.admin.CategoryProviderAliasList">
|
||||
<xrd:adapter objectType="com.arsdigita.categorization.Category">
|
||||
<xrd:attributes rule="exclude">
|
||||
<xrd:property name="/object/id"/>
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
</xrd:attributes>
|
||||
</xrd:adapter>
|
||||
|
||||
<xrd:adapter objectType="com.arsdigita.london.atoz.AtoZCategoryAlias">
|
||||
<xrd:adapter objectType="com.arsdigita.atoz.AtoZCategoryAlias">
|
||||
<xrd:attributes rule="exclude">
|
||||
<xrd:property name="/object/id"/>
|
||||
<xrd:property name="/object/objectType"/>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
</xrd:adapter>
|
||||
</xrd:context>
|
||||
|
||||
<xrd:context name="com.arsdigita.london.atoz.ui.admin.ItemProviderAliasList">
|
||||
<xrd:context name="com.arsdigita.atoz.ui.admin.ItemProviderAliasList">
|
||||
<xrd:adapter objectType="com.arsdigita.cms.ContentItem">
|
||||
<xrd:attributes rule="exclude">
|
||||
<!--
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
</xrd:attributes>
|
||||
</xrd:adapter>
|
||||
|
||||
<xrd:adapter objectType="com.arsdigita.london.atoz.AtoZItemAlias">
|
||||
<xrd:adapter objectType="com.arsdigita.atoz.AtoZItemAlias">
|
||||
<xrd:attributes rule="exclude">
|
||||
<!--
|
||||
<xrd:property name="/object/id"/>
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@ import com.arsdigita.util.parameter.ResourceParameter;
|
|||
import com.arsdigita.london.util.ui.ApplicationCategoryPicker;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.Set;
|
||||
import java.util.HashSet;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public class Initializer extends CompoundInitializer {
|
|||
final String url = RuntimeConfig.getConfig().getJDBCURL();
|
||||
final int database = DbHelper.getDatabaseFromURL(url);
|
||||
|
||||
add(new PDLInitializer(new ManifestSource("ccm-ldn-atoz.pdl.mf",
|
||||
add(new PDLInitializer(new ManifestSource("ccm-atoz.pdl.mf",
|
||||
new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
|
||||
}
|
||||
|
||||
|
|
@ -117,6 +117,7 @@ public class Initializer extends CompoundInitializer {
|
|||
SiteProxyProviderForm.class,
|
||||
SiteProxyProviderAdmin.class));
|
||||
*/
|
||||
|
||||
// Introduces dependenciy on navigation package
|
||||
// Function / purpose ??
|
||||
ApplicationNavigationModel.register(AtoZ.class.getName(),
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
package com.arsdigita.atoz.ui.admin;
|
||||
|
||||
import com.arsdigita.atoz.AtoZCategoryProvider;
|
||||
import com.arsdigita.london.util.ui.ObjectCategoryPicker;
|
||||
import com.arsdigita.categorization.ui.ObjectCategoryPicker;
|
||||
|
||||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.bebop.SaveCancelSection;
|
||||
|
|
|
|||
|
|
@ -21,16 +21,19 @@ package com.arsdigita.atoz.ui.admin;
|
|||
import com.arsdigita.atoz.AtoZ;
|
||||
import com.arsdigita.atoz.AtoZProvider;
|
||||
import com.arsdigita.atoz.AtoZCategoryProvider;
|
||||
import com.arsdigita.london.util.ui.CategoryPicker;
|
||||
|
||||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.bebop.SimpleComponent;
|
||||
import com.arsdigita.bebop.form.CheckboxGroup;
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
|
||||
import com.arsdigita.categorization.ui.CategoryPicker;
|
||||
import com.arsdigita.util.Classes;
|
||||
|
||||
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
*/
|
||||
public class CategoryProviderForm extends ProviderForm {
|
||||
|
||||
private CheckboxGroup m_compound;
|
||||
|
|
@ -43,6 +46,7 @@ public class CategoryProviderForm extends ProviderForm {
|
|||
setMetaDataAttribute("title", "Category provider properties");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addWidgets() {
|
||||
super.addWidgets();
|
||||
|
||||
|
|
@ -59,6 +63,7 @@ public class CategoryProviderForm extends ProviderForm {
|
|||
add(m_rootCategory);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void processWidgets(PageState state,
|
||||
AtoZProvider provider) {
|
||||
super.processWidgets(state, provider);
|
||||
|
|
@ -71,6 +76,7 @@ public class CategoryProviderForm extends ProviderForm {
|
|||
myprovider.setRootCategory(root);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initWidgets(PageState state,
|
||||
AtoZProvider provider) {
|
||||
super.initWidgets(state, provider);
|
||||
|
|
|
|||
|
|
@ -48,6 +48,10 @@ import com.arsdigita.util.UncheckedWrapperException;
|
|||
import java.math.BigDecimal;
|
||||
import java.util.TooManyListenersException;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
*/
|
||||
public class ItemProviderAliasForm extends Form {
|
||||
|
||||
private ACSObjectSelectionModel m_provider;
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ public class ItemProviderAliasList extends SimpleContainer {
|
|||
m_provider = provider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void respond(PageState state) {
|
||||
String key = state.getControlEventName();
|
||||
String value = state.getControlEventValue();
|
||||
|
|
@ -54,6 +55,7 @@ public class ItemProviderAliasList extends SimpleContainer {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateXML(PageState state,
|
||||
Element parent) {
|
||||
Element content = AtoZ.newElement("itemProviderAliasList");
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ import com.arsdigita.domain.DomainServiceInterfaceExposer;
|
|||
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
|
||||
import com.arsdigita.atoz.AtoZItemProvider;
|
||||
import com.arsdigita.atoz.AtoZProvider;
|
||||
import com.arsdigita.london.util.ui.AbstractCategoryPicker;
|
||||
import com.arsdigita.london.util.ui.CategoryPicker;
|
||||
import com.arsdigita.categorization.ui.AbstractCategoryPicker;
|
||||
import com.arsdigita.categorization.ui.CategoryPicker;
|
||||
import com.arsdigita.persistence.DataCollection;
|
||||
import com.arsdigita.persistence.DataObject;
|
||||
import com.arsdigita.persistence.SessionManager;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ package com.arsdigita.atoz.ui.admin;
|
|||
|
||||
import com.arsdigita.atoz.AtoZ;
|
||||
import com.arsdigita.bebop.SimpleContainer;
|
||||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.bebop.event.ActionListener;
|
||||
import com.arsdigita.bebop.event.ActionEvent;
|
||||
import com.arsdigita.bebop.PageState;
|
||||
|
|
|
|||
|
|
@ -19,36 +19,25 @@
|
|||
|
||||
package com.arsdigita.atoz.ui.admin;
|
||||
|
||||
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
|
||||
import com.arsdigita.atoz.AtoZCategoryProvider;
|
||||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.cms.CMS;
|
||||
import com.arsdigita.domain.DomainCollection;
|
||||
import com.arsdigita.domain.DomainObjectFactory;
|
||||
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
|
||||
import com.arsdigita.london.terms.Domain;
|
||||
import com.arsdigita.london.terms.Term;
|
||||
import com.arsdigita.london.terms.Terms;
|
||||
|
||||
import com.arsdigita.aplaws.Aplaws;
|
||||
import com.arsdigita.bebop.form.Widget;
|
||||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.bebop.parameters.ArrayParameter;
|
||||
import com.arsdigita.bebop.parameters.StringParameter;
|
||||
import com.arsdigita.bebop.parameters.BigDecimalParameter;
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.domain.DomainCollection;
|
||||
import com.arsdigita.domain.DomainObjectFactory;
|
||||
import com.arsdigita.persistence.DataCollection;
|
||||
import com.arsdigita.persistence.SessionManager;
|
||||
import com.arsdigita.xml.Element;
|
||||
import com.arsdigita.xml.XML;
|
||||
|
||||
import com.arsdigita.cms.CMS;
|
||||
import com.arsdigita.cms.ContentSection;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
|
||||
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
|
||||
<jsp:directive.page import="com.arsdigita.london.atoz.ui.admin.AdminPane"/>
|
||||
<jsp:directive.page import="com.arsdigita.atoz.ui.admin.AdminPane"/>
|
||||
<jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/>
|
||||
|
||||
<jsp:scriptlet>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<define:page name="childCategories" pageClass="com.arsdigita.cms.ui.authoring.EmptyPage" title="childCategories" cache="true">
|
||||
|
||||
<define:component name="catSubtree"
|
||||
classname="com.arsdigita.aplaws.ui.CategorySubtree"/>
|
||||
classname="com.arsdigita.london.terms.ui.CategorySubtree"/>
|
||||
</define:page>
|
||||
|
||||
<show:all/>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
|
||||
<jsp:directive.page import="com.arsdigita.bebop.parameters.StringParameter"/>
|
||||
<jsp:directive.page import="com.arsdigita.london.atoz.ui.AtoZPane"/>
|
||||
<jsp:directive.page import="com.arsdigita.atoz.ui.AtoZPane"/>
|
||||
|
||||
<jsp:scriptlet>
|
||||
DispatcherHelper.cacheDisable(response);
|
||||
|
|
|
|||
|
|
@ -549,7 +549,7 @@
|
|||
|
||||
<xsl:template match="atoz:providerDetails">
|
||||
<xsl:choose>
|
||||
<xsl:when test="objectType = 'com.arsdigita.london.atoz.AtoZCategoryProvider'">
|
||||
<xsl:when test="objectType = 'com.arsdigita.atoz.AtoZCategoryProvider'">
|
||||
<table class="property">
|
||||
<thead>
|
||||
<th colspan="2">Category Provider Details</th>
|
||||
|
|
@ -572,7 +572,7 @@
|
|||
</tr>
|
||||
</table>
|
||||
</xsl:when>
|
||||
<xsl:when test="objectType = 'com.arsdigita.london.atoz.AtoZItemProvider'">
|
||||
<xsl:when test="objectType = 'com.arsdigita.atoz.AtoZItemProvider'">
|
||||
<table class="property">
|
||||
<thead>
|
||||
<th colspan="2">Item Provider Details</th>
|
||||
|
|
@ -595,7 +595,7 @@
|
|||
</tr>
|
||||
</table>
|
||||
</xsl:when>
|
||||
<xsl:when test="objectType = 'com.arsdigita.london.atoz.AtoZSiteProxyProvider'">
|
||||
<xsl:when test="objectType = 'com.arsdigita.atoz.siteproxy.AtoZSiteProxyProvider'">
|
||||
<table class="property">
|
||||
<thead>
|
||||
<th colspan="2">SiteProxy Provider Details</th>
|
||||
|
|
|
|||
|
|
@ -34,10 +34,32 @@ public final class CategorizationConfig extends AbstractConfig {
|
|||
|
||||
private static Logger s_log = Logger.getLogger(CategorizationConfig.class);
|
||||
|
||||
/** A logger instance to assist debugging. */
|
||||
private final Parameter m_showInternalName;
|
||||
|
||||
/** Singelton config object. */
|
||||
private static CategorizationConfig s_conf;
|
||||
|
||||
/**
|
||||
* Public Constructor
|
||||
* Gain a CategorizationConfig object.
|
||||
*
|
||||
* Singelton pattern, don't instantiate a config object using the
|
||||
* constructor directly!
|
||||
* @return
|
||||
*/
|
||||
public static synchronized CategorizationConfig getConfig() {
|
||||
if (s_conf == null) {
|
||||
s_conf = new CategorizationConfig();
|
||||
s_conf.load();
|
||||
}
|
||||
|
||||
return s_conf;
|
||||
}
|
||||
|
||||
/**
|
||||
* Public Constructor, BUT:
|
||||
* Singelton pattern, don't instantiate a config object using the
|
||||
* constructor directly!
|
||||
*/
|
||||
public CategorizationConfig() {
|
||||
|
||||
|
|
|
|||
|
|
@ -121,13 +121,8 @@ public class Category extends ACSObject {
|
|||
new PrivilegeDescriptor(
|
||||
"map_to_category");
|
||||
// Quasimodo: Begin
|
||||
private static CategorizationConfig s_config = new CategorizationConfig();
|
||||
|
||||
static {
|
||||
s_log.debug("Static initalizer starting...");
|
||||
s_config.load();
|
||||
s_log.debug("Static initalizer finished.");
|
||||
}
|
||||
private static CategorizationConfig s_config = CategorizationConfig
|
||||
.getConfig();
|
||||
// Quasimodo: End
|
||||
public static final String ROOT_CATEGORY = "rootCategory";
|
||||
public static final String USE_CONTEXT = "useContext";
|
||||
|
|
|
|||
|
|
@ -16,17 +16,18 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
package com.arsdigita.london.util.ui;
|
||||
package com.arsdigita.categorization.ui;
|
||||
|
||||
|
||||
import com.arsdigita.bebop.form.SingleSelect;
|
||||
import com.arsdigita.bebop.event.PrintListener;
|
||||
import com.arsdigita.bebop.event.PrintEvent;
|
||||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.domain.DomainObjectFactory;
|
||||
import com.arsdigita.persistence.OID;
|
||||
import com.arsdigita.toolbox.ui.OIDParameter;
|
||||
import com.arsdigita.categorization.Category;
|
||||
|
||||
import java.util.TooManyListenersException;
|
||||
|
||||
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
package com.arsdigita.london.util;
|
||||
package com.arsdigita.categorization.ui;
|
||||
|
||||
import com.arsdigita.categorization.Category;
|
||||
|
||||
|
|
@ -30,22 +30,30 @@ import java.math.BigDecimal;
|
|||
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
public class Categorization {
|
||||
/**
|
||||
* Utility class provides categorisation trees to help building categorization
|
||||
* ui widgets.
|
||||
*/
|
||||
public class CategorizationTree {
|
||||
|
||||
private static final Logger s_log = Logger.getLogger(Categorization.class);
|
||||
private static final Logger s_log = Logger.getLogger(CategorizationTree.class);
|
||||
|
||||
/**
|
||||
* Retrieves the category subtree for the given root.
|
||||
* The returned map has String objects for full path
|
||||
* name as keys, and Category objects as values
|
||||
*/
|
||||
public static Map categorySubtreePath(Category root) {
|
||||
return categorySubtreePath(root, " > ");
|
||||
public static Map getSubtreePath(Category root) {
|
||||
return getSubtreePath(root, " > ");
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the category subtree for the given root.
|
||||
* The returned map has String objects for full path
|
||||
* name as keys, and Category objects as values
|
||||
*/
|
||||
public static Map categorySubtreePath(Category root, String join) {
|
||||
public static Map getSubtreePath(Category root, String join) {
|
||||
|
||||
DomainCollection cats = new DomainCollection(
|
||||
SessionManager.getSession().retrieve(Category.BASE_DATA_OBJECT_TYPE)
|
||||
);
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
package com.arsdigita.london.util.ui;
|
||||
package com.arsdigita.categorization.ui;
|
||||
|
||||
import com.arsdigita.bebop.Component;
|
||||
import com.arsdigita.bebop.PageState;
|
||||
|
|
@ -25,6 +25,5 @@ import com.arsdigita.categorization.Category;
|
|||
public interface CategoryPicker extends Component {
|
||||
|
||||
Category getCategory(PageState state);
|
||||
void setCategory(PageState state,
|
||||
Category cat);
|
||||
void setCategory(PageState state, Category cat);
|
||||
}
|
||||
|
|
@ -16,14 +16,13 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
package com.arsdigita.london.util.ui;
|
||||
package com.arsdigita.categorization.ui;
|
||||
|
||||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.bebop.form.SingleSelect;
|
||||
import com.arsdigita.bebop.form.Option;
|
||||
import com.arsdigita.kernel.ACSObject;
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.london.util.Categorization;
|
||||
import com.arsdigita.kernel.ACSObject;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
|
@ -50,7 +49,7 @@ public abstract class ObjectCategoryPicker extends AbstractCategoryPicker {
|
|||
return;
|
||||
}
|
||||
|
||||
Map cats = Categorization.categorySubtreePath(root, " > ");
|
||||
Map cats = CategorizationTree.getSubtreePath(root, " > ");
|
||||
Iterator i = cats.keySet().iterator();
|
||||
target.addOption(new Option(null, "-- pick one --"));
|
||||
while (i.hasNext()) {
|
||||
|
|
@ -60,19 +60,23 @@ import com.arsdigita.web.ApplicationType;
|
|||
import com.arsdigita.web.Host;
|
||||
import com.arsdigita.web.Web;
|
||||
import com.arsdigita.webdevsupport.WebDevSupport;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.mail.internet.InternetAddress;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
<ccm:application name="ccm-cms-types-siteproxy"/>
|
||||
|
||||
<!-- Applications -->
|
||||
<ccm:application name="ccm-atoz"/>
|
||||
<ccm:application name="ccm-navigation"/>
|
||||
<!-- ccm-portalworkspace depends on ccm-subsite -->
|
||||
<ccm:application name="ccm-portalworkspace"/>
|
||||
|
|
@ -52,7 +53,7 @@
|
|||
|
||||
<!-- LDN core extensions -->
|
||||
<ccm:application name="ccm-ldn-aplaws"/>
|
||||
<ccm:application name="ccm-ldn-atoz"/>
|
||||
<!-- <ccm:application name="ccm-ldn-atoz"/> -->
|
||||
<ccm:application name="ccm-ldn-dublin"/>
|
||||
<ccm:application name="ccm-ldn-search"/>
|
||||
<ccm:application name="ccm-ldn-terms"/>
|
||||
|
|
|
|||
|
|
@ -219,16 +219,16 @@
|
|||
MODULES SERVLET DECLARATIONS SECTION
|
||||
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
|
||||
|
||||
<!-- module ccm-ldn-atoz - servlet definitions BEGIN -->
|
||||
<!-- module ccm-atoz - servlet definitions BEGIN -->
|
||||
<servlet>
|
||||
<servlet-name>atoz-files</servlet-name>
|
||||
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
|
||||
<init-param>
|
||||
<param-name>template-path</param-name>
|
||||
<param-value>/templates/ccm-ldn-atoz</param-value>
|
||||
<param-value>/templates/ccm-atoz</param-value>
|
||||
</init-param>
|
||||
</servlet>
|
||||
<!-- module ccm-ldn-atoz - servlet definitions END -->
|
||||
<!-- module ccm-atoz - servlet definitions END -->
|
||||
|
||||
<!-- module ccm-forum - servlet declarations BEGIN -->
|
||||
<servlet>
|
||||
|
|
@ -362,12 +362,12 @@
|
|||
MODULES SERVLET MAPPINGS SECTION
|
||||
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
|
||||
|
||||
<!-- module ccm-ldn-atoz - servlet mappings BEGIN -->
|
||||
<!-- module ccm-atoz - servlet mappings BEGIN -->
|
||||
<servlet-mapping>
|
||||
<servlet-name>atoz-files</servlet-name>
|
||||
<url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
|
||||
<url-pattern>/ccm-atoz/files/*</url-pattern>
|
||||
</servlet-mapping>
|
||||
<!-- module ccm-ldn-atoz - servlet mappings END -->
|
||||
<!-- module ccm-atoz - servlet mappings END -->
|
||||
|
||||
<!-- module ccm-forum - servlet mappings BEGIN -->
|
||||
<servlet-mapping>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import com.arsdigita.bebop.PageState;
|
|||
import com.arsdigita.bebop.form.Option;
|
||||
import com.arsdigita.bebop.form.SingleSelect;
|
||||
import com.arsdigita.london.terms.Term;
|
||||
import com.arsdigita.london.util.ui.AbstractCategoryPicker;
|
||||
import com.arsdigita.categorization.ui.AbstractCategoryPicker;
|
||||
import com.arsdigita.persistence.DataCollection;
|
||||
import com.arsdigita.persistence.OID;
|
||||
import com.arsdigita.persistence.SessionManager;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import com.arsdigita.bebop.form.Option;
|
|||
import com.arsdigita.bebop.form.SingleSelect;
|
||||
import com.arsdigita.domain.DomainObjectFactory;
|
||||
import com.arsdigita.london.terms.Domain;
|
||||
import com.arsdigita.london.util.ui.AbstractCategoryPicker;
|
||||
import com.arsdigita.categorization.ui.AbstractCategoryPicker;
|
||||
import com.arsdigita.persistence.DataCollection;
|
||||
import com.arsdigita.persistence.OID;
|
||||
import com.arsdigita.persistence.SessionManager;
|
||||
|
|
|
|||
|
|
@ -9,25 +9,25 @@
|
|||
objectType="com.arsdigita.london.contenttypes.Contact"
|
||||
classname="com.arsdigita.london.contenttypes.Contact">
|
||||
|
||||
<ctd:authoring-kit createComponent="com.arsdigita.london.contenttypes.ui.contact.ContactCreate">
|
||||
<ctd:authoring-kit createComponent="com.arsdigita.london.contenttypes.ui.ContactCreate">
|
||||
|
||||
<ctd:authoring-step
|
||||
label="Contact Properties"
|
||||
description="Edit the basic contact properties"
|
||||
descriptionBundle="com.arsdigita.cms.contenttypes.ContactResources"
|
||||
component="com.arsdigita.london.contenttypes.ui.contact.ContactPropertiesStep"/>
|
||||
component="com.arsdigita.london.contenttypes.ui.ContactPropertiesStep"/>
|
||||
|
||||
<ctd:authoring-step
|
||||
label="Contact Address Properties"
|
||||
description="Edit the basic contact properties"
|
||||
descriptionBundle="com.arsdigita.london.contenttypes.ContactResources"
|
||||
component="com.arsdigita.london.contenttypes.ui.contact.AddressProperties"/>
|
||||
component="com.arsdigita.london.contenttypes.ui.ContactAddressProperties"/>
|
||||
|
||||
<ctd:authoring-step
|
||||
label="Contact Phones"
|
||||
description="Edit the Phones associated with contact"
|
||||
descriptionBundle="com.arsdigita.london.contenttypes.ContactResources"
|
||||
component="com.arsdigita.london.contenttypes.ui.contact.PhonesPanel"/>
|
||||
component="com.arsdigita.london.contenttypes.ui.ContactPhonesPanel"/>
|
||||
|
||||
</ctd:authoring-kit>
|
||||
</ctd:content-type>
|
||||
|
|
|
|||
|
|
@ -340,9 +340,9 @@ public class Contact extends ContentPage {
|
|||
/**
|
||||
* Return collection of Phone objects associated with this Contact object.
|
||||
*/
|
||||
public PhonesCollection getPhones(){
|
||||
public ContactPhonesCollection getPhones(){
|
||||
DataAssociationCursor dac = ((DataAssociation) get(PHONES)).cursor();
|
||||
return new PhonesCollection(dac);
|
||||
return new ContactPhonesCollection(dac);
|
||||
}
|
||||
|
||||
private DataObject retrieveDataobject(String attr){
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import com.arsdigita.cms.ContentPage;
|
|||
import com.arsdigita.cms.ContentSection;
|
||||
import com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter;
|
||||
import com.arsdigita.cms.contenttypes.ContentTypeInitializer;
|
||||
import com.arsdigita.london.contenttypes.ui.AddContactPropertiesStep;
|
||||
import com.arsdigita.london.contenttypes.ui.ContactPropertiesAddStep;
|
||||
import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
|
||||
import com.arsdigita.globalization.GlobalizedMessage;
|
||||
import com.arsdigita.runtime.DomainInitEvent;
|
||||
|
|
@ -151,7 +151,7 @@ public class ContactInitializer extends ContentTypeInitializer {
|
|||
}
|
||||
|
||||
private Class getAuthoringStep() {
|
||||
return AddContactPropertiesStep.class;
|
||||
return ContactPropertiesAddStep.class;
|
||||
}
|
||||
|
||||
private String getBaseType() {
|
||||
|
|
|
|||
|
|
@ -26,15 +26,15 @@ import com.arsdigita.persistence.DataCollection;
|
|||
*
|
||||
* @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
|
||||
*
|
||||
* @version $Id: PhonesCollection.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
* @version $Id: ContactPhonesCollection.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
*/
|
||||
public class PhonesCollection extends DomainCollection {
|
||||
public class ContactPhonesCollection extends DomainCollection {
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
**/
|
||||
public PhonesCollection(DataCollection dataCollection) {
|
||||
public ContactPhonesCollection(DataCollection dataCollection) {
|
||||
super(dataCollection);
|
||||
}
|
||||
|
||||
|
|
@ -33,21 +33,21 @@ import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
|
|||
*
|
||||
* @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
|
||||
*
|
||||
* @version $Id: AddressProperties.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
* @version $Id: ContactAddressProperties.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
*
|
||||
*/
|
||||
public class AddressProperties extends SimpleEditStep {
|
||||
public class ContactAddressProperties extends SimpleEditStep {
|
||||
|
||||
/** The name of the editing sheet added to this step */
|
||||
public static String EDIT_SHEET_NAME = "edit-contact-address";
|
||||
|
||||
public AddressProperties(ItemSelectionModel itemModel,
|
||||
public ContactAddressProperties(ItemSelectionModel itemModel,
|
||||
AuthoringKitWizard parent) {
|
||||
super(itemModel, parent);
|
||||
|
||||
BasicItemForm form;
|
||||
|
||||
form = new AddressPropertyForm(itemModel);
|
||||
form = new ContactAddressPropertyForm(itemModel);
|
||||
|
||||
add(EDIT_SHEET_NAME,
|
||||
"Edit",
|
||||
|
|
@ -38,15 +38,15 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm;
|
|||
*
|
||||
* @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
|
||||
*
|
||||
* @version $Id: AddressPropertyForm.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
* @version $Id: ContactAddressPropertyForm.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
*
|
||||
*/
|
||||
public class AddressPropertyForm extends BasicItemForm {
|
||||
public class ContactAddressPropertyForm extends BasicItemForm {
|
||||
|
||||
/** Name of this form */
|
||||
private static final String ID = "Contact_address_edit";
|
||||
|
||||
private static final Logger s_log = Logger.getLogger(AddressPropertyForm.class);
|
||||
private static final Logger s_log = Logger.getLogger(ContactAddressPropertyForm.class);
|
||||
|
||||
/**
|
||||
* Creates a new form to edit the <code>ContactAddress</code> object
|
||||
|
|
@ -56,7 +56,7 @@ public class AddressPropertyForm extends BasicItemForm {
|
|||
* @param itemModel The ItemSelectionModel to use to obtain the Contact
|
||||
* object to work on
|
||||
**/
|
||||
public AddressPropertyForm(ItemSelectionModel itemModel) {
|
||||
public ContactAddressPropertyForm(ItemSelectionModel itemModel) {
|
||||
super(ID, itemModel);
|
||||
}
|
||||
|
||||
|
|
@ -41,10 +41,10 @@ import java.util.ArrayList;
|
|||
*
|
||||
* @author Shashin Shinde <sshinde@redhat.com>
|
||||
*
|
||||
* @version $Id: CreatePhone.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
* @version $Id: ContactCreatePhone.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
*
|
||||
*/
|
||||
class CreatePhone extends BasicItemForm {
|
||||
class ContactCreatePhone extends BasicItemForm {
|
||||
|
||||
private ItemSelectionModel m_model;
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ class CreatePhone extends BasicItemForm {
|
|||
* The ItemSelectionModel to use to obtain the Contact object to
|
||||
* work on
|
||||
*/
|
||||
public CreatePhone(ItemSelectionModel itemModel) {
|
||||
public ContactCreatePhone(ItemSelectionModel itemModel) {
|
||||
super("Contact_phone_create", itemModel);
|
||||
m_model = itemModel;
|
||||
}
|
||||
|
|
@ -30,18 +30,18 @@ import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
|
|||
*
|
||||
* @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
|
||||
*
|
||||
* @version $Id: PhonesPanel.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
* @version $Id: ContactPhonesPanel.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
*
|
||||
*/
|
||||
public class PhonesPanel extends SimpleEditStep {
|
||||
public class ContactPhonesPanel extends SimpleEditStep {
|
||||
|
||||
/** The name of the editing sheet added to this step */
|
||||
private static String EDIT_SHEET_NAME = "manage-phones";
|
||||
|
||||
public PhonesPanel(ItemSelectionModel itemModel, AuthoringKitWizard parent) {
|
||||
public ContactPhonesPanel(ItemSelectionModel itemModel, AuthoringKitWizard parent) {
|
||||
super(itemModel, parent);
|
||||
|
||||
BasicItemForm form = new CreatePhone(itemModel);
|
||||
BasicItemForm form = new ContactCreatePhone(itemModel);
|
||||
|
||||
add(
|
||||
EDIT_SHEET_NAME,
|
||||
|
|
@ -49,7 +49,7 @@ public class PhonesPanel extends SimpleEditStep {
|
|||
new WorkflowLockedComponentAccess(form, itemModel),
|
||||
form.getSaveCancelSection().getCancelButton());
|
||||
|
||||
PhonesTable phTable = new PhonesTable(itemModel);
|
||||
ContactPhonesTable phTable = new ContactPhonesTable(itemModel);
|
||||
setDisplayComponent(phTable);
|
||||
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ import com.arsdigita.cms.ItemSelectionModel;
|
|||
import com.arsdigita.cms.SecurityManager;
|
||||
import com.arsdigita.london.contenttypes.Contact;
|
||||
import com.arsdigita.london.contenttypes.ContactPhone;
|
||||
import com.arsdigita.london.contenttypes.PhonesCollection;
|
||||
import com.arsdigita.london.contenttypes.ContactPhonesCollection;
|
||||
import com.arsdigita.cms.dispatcher.Utilities;
|
||||
import com.arsdigita.util.LockableImpl;
|
||||
|
||||
|
|
@ -46,10 +46,10 @@ import java.math.BigDecimal;
|
|||
*
|
||||
* @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
|
||||
*
|
||||
* @version $Id: PhonesTable.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
* @version $Id: ContactPhonesTable.java 287 2005-02-22 00:29:02Z sskracic $
|
||||
*
|
||||
*/
|
||||
class PhonesTable extends Table implements TableActionListener{
|
||||
class ContactPhonesTable extends Table implements TableActionListener{
|
||||
|
||||
private ItemSelectionModel m_contactSel;
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ class PhonesTable extends Table implements TableActionListener{
|
|||
* @param selContact , ItemSelectionModel which provides the
|
||||
* <code>Contact</code> object whose Phones are to be manipulated.
|
||||
*/
|
||||
public PhonesTable(ItemSelectionModel selContact) {
|
||||
public ContactPhonesTable(ItemSelectionModel selContact) {
|
||||
super();
|
||||
m_contactSel = selContact;
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ class PhonesTable extends Table implements TableActionListener{
|
|||
private class PhonesTableModel implements TableModel{
|
||||
|
||||
private Table m_table;
|
||||
private PhonesCollection m_phones;
|
||||
private ContactPhonesCollection m_phones;
|
||||
private ContactPhone m_phone;
|
||||
|
||||
private PhonesTableModel(Table t,PageState ps,Contact c){
|
||||
|
|
@ -26,10 +26,10 @@ import com.arsdigita.util.Assert;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class AddContactPropertiesStep extends ResettableContainer {
|
||||
public class ContactPropertiesAddStep extends ResettableContainer {
|
||||
|
||||
private static final Logger s_log = Logger
|
||||
.getLogger(AddContactPropertiesStep.class);
|
||||
.getLogger(ContactPropertiesAddStep.class);
|
||||
|
||||
public static final String EDIT_SHEET_NAME = "edit";
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ public class AddContactPropertiesStep extends ResettableContainer {
|
|||
|
||||
private ContactDisplay m_display;
|
||||
|
||||
public AddContactPropertiesStep(ItemSelectionModel itemModel,
|
||||
public ContactPropertiesAddStep(ItemSelectionModel itemModel,
|
||||
AuthoringKitWizard parent) {
|
||||
|
||||
m_parent = parent;
|
||||
|
|
@ -76,7 +76,7 @@ public class AddContactPropertiesStep extends ResettableContainer {
|
|||
}
|
||||
|
||||
private Component getFindContactSheet() {
|
||||
return new AddContactToItemForm(this);
|
||||
return new ContactToItemAddForm(this);
|
||||
}
|
||||
|
||||
public ItemSelectionModel getItemSelectionModel() {
|
||||
|
|
@ -22,7 +22,7 @@ import com.arsdigita.london.contenttypes.Contact;
|
|||
import com.arsdigita.cms.ui.ItemSearchWidget;
|
||||
import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
|
||||
|
||||
public class AddContactToItemForm extends FormSection implements
|
||||
public class ContactToItemAddForm extends FormSection implements
|
||||
FormInitListener, FormValidationListener, FormProcessListener,
|
||||
FormSubmissionListener {
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ public class AddContactToItemForm extends FormSection implements
|
|||
|
||||
private Label m_searchFormLabel;
|
||||
|
||||
private AddContactPropertiesStep m_step;
|
||||
private ContactPropertiesAddStep m_step;
|
||||
|
||||
private AuthoringKitWizard m_parent;
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ public class AddContactToItemForm extends FormSection implements
|
|||
|
||||
private ActionLink m_removeLink;
|
||||
|
||||
public AddContactToItemForm(AddContactPropertiesStep step) {
|
||||
public ContactToItemAddForm(ContactPropertiesAddStep step) {
|
||||
m_step = step;
|
||||
m_parent = m_step.getParent();
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ public class AddContactToItemForm extends FormSection implements
|
|||
add(m_itemSearch);
|
||||
}
|
||||
|
||||
public AddContactToItemForm getThis() {
|
||||
public ContactToItemAddForm getThis() {
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
package com.arsdigita.london.util.ui;
|
||||
|
||||
import com.arsdigita.categorization.ui.ObjectCategoryPicker;
|
||||
import com.arsdigita.web.Web;
|
||||
import com.arsdigita.kernel.ACSObject;
|
||||
import com.arsdigita.bebop.PageState;
|
||||
|
|
|
|||
|
|
@ -28,8 +28,9 @@ import java.math.BigDecimal;
|
|||
|
||||
|
||||
public abstract class UserPicker extends FormSection
|
||||
implements FormProcessListener, FormInitListener
|
||||
{
|
||||
implements FormProcessListener,
|
||||
FormInitListener {
|
||||
|
||||
private static final int USER_LIST_SIZE = 10;
|
||||
|
||||
private static final String ADD_USER = "addUser";
|
||||
|
|
@ -185,6 +186,7 @@ public abstract class UserPicker extends FormSection
|
|||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void register( Page p ) {
|
||||
super.register( p );
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ import com.arsdigita.util.UncheckedWrapperException;
|
|||
import com.arsdigita.util.StringUtils;
|
||||
import com.arsdigita.kernel.ResourceType;
|
||||
|
||||
import com.arsdigita.london.util.ui.CategoryPicker;
|
||||
import com.arsdigita.categorization.ui.CategoryPicker;
|
||||
import com.arsdigita.london.util.ui.ApplicationCategoryPicker;
|
||||
|
||||
import com.redhat.persistence.metadata.Root;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ import com.arsdigita.kernel.ResourceType;
|
|||
import com.arsdigita.portalworkspace.portlet.ContentDirectoryPortlet;
|
||||
// @deprecated use com.arsdigita.bebop.portal.PortletConfigFormSection
|
||||
// import com.arsdigita.london.portal.ui.PortletConfigFormSection;
|
||||
import com.arsdigita.london.util.Categorization;
|
||||
import com.arsdigita.categorization.ui.CategorizationTree;
|
||||
import com.arsdigita.persistence.OID;
|
||||
import com.arsdigita.portal.Portlet;
|
||||
import com.arsdigita.util.UncheckedWrapperException;
|
||||
|
|
@ -175,7 +175,7 @@ public class ContentDirectoryPortletEditor extends PortletConfigFormSection {
|
|||
Application app = Web.getContext().getApplication();
|
||||
Category root = Category.getRootForObject(app, getUseContext());
|
||||
|
||||
Map cats = Categorization.categorySubtreePath(root, " > ");
|
||||
Map cats = CategorizationTree.getSubtreePath(root, " > ");
|
||||
Iterator i = cats.keySet().iterator();
|
||||
while (i.hasNext()) {
|
||||
String path = (String) i.next();
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import java.text.SimpleDateFormat;
|
|||
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.categorization.CategorizedCollection;
|
||||
import com.arsdigita.london.util.Categorization;
|
||||
import com.arsdigita.categorization.ui.CategorizationTree;
|
||||
import com.arsdigita.cms.ContentBundle;
|
||||
import com.arsdigita.cms.ContentPage;
|
||||
import com.arsdigita.cms.ContentItem;
|
||||
|
|
@ -405,7 +405,7 @@ public class RSSService {
|
|||
Element itemsSeq = new Element("Seq", rdfNS);
|
||||
channelItems.addContent(itemsSeq);
|
||||
|
||||
Map cats = Categorization.categorySubtreePath(root);
|
||||
Map cats = CategorizationTree.getSubtreePath(root);
|
||||
s_log.debug("Get categories");
|
||||
Iterator i = cats.keySet().iterator();
|
||||
s_log.debug("About to iterate");
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ import com.arsdigita.bebop.parameters.ParameterData;
|
|||
import com.arsdigita.bebop.PageState;
|
||||
import com.arsdigita.categorization.Category;
|
||||
import com.arsdigita.kernel.ACSObject;
|
||||
import com.arsdigita.london.util.ui.CategoryPicker;
|
||||
import com.arsdigita.categorization.ui.CategoryPicker;
|
||||
import com.arsdigita.persistence.DataCollection;
|
||||
import com.arsdigita.persistence.SessionManager;
|
||||
import com.arsdigita.subsite.Site;
|
||||
|
|
|
|||
Loading…
Reference in New Issue