You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ssk...@vh...> - 2005-09-12 09:35:09
|
Author: sskracic Date: 2005-09-12 11:25:57 +0200 (Mon, 12 Sep 2005) New Revision: 766 Modified: releases/1.0.2/ccm-ldn-atoz/application.xml releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl Log: Integrated r765 from trunk (disabled category should have all its children removed from AtoZ category listing). Modified: releases/1.0.2/ccm-ldn-atoz/application.xml =================================================================== --- releases/1.0.2/ccm-ldn-atoz/application.xml 2005-09-12 09:24:15 UTC (rev 765) +++ releases/1.0.2/ccm-ldn-atoz/application.xml 2005-09-12 09:25:57 UTC (rev 766) @@ -3,7 +3,7 @@ name="ccm-ldn-atoz" prettyName="A-Z" version="1.0.2" - release="4"> + release="5"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> Modified: releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl =================================================================== --- releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-12 09:24:15 UTC (rev 765) +++ releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-12 09:25:57 UTC (rev 766) @@ -70,11 +70,20 @@ cat_root_cat_object_map m where c.category_id = a.object_id and c.category_id = i.subcategory_id - and c.enabled_p = '1' and i.category_id = m.category_id and m.object_id = :providerID and not exists ( select 1 + from cat_cat_subcat_trans_index i2 + where i2.category_id in ( + select c2.category_id + from cat_categories c2 + where c2.enabled_p = '0' + ) + and i2.subcategory_id = c.category_id + ) + and not exists ( + select 1 from atoz_cat_blacklist_map b where b.category_id = c.category_id and b.provider_id = :providerID @@ -127,7 +136,6 @@ cat_cat_subcat_trans_index i where c.category_id = a.object_id and c.category_id = i.subcategory_id - and c.enabled_p = '1' and i.category_id = :rootCategoryID and not exists ( select 1 @@ -137,6 +145,16 @@ ) and not exists ( select 1 + from cat_cat_subcat_trans_index i2 + where i2.category_id in ( + select c2.category_id + from cat_categories c2 + where c2.enabled_p = '0' + ) + and i2.subcategory_id = c.category_id + ) + and not exists ( + select 1 from atoz_cat_alias_map b where b.category_id = c.category_id and b.provider_id = :providerID |
From: <ssk...@vh...> - 2005-09-12 09:33:30
|
Author: sskracic Date: 2005-09-12 11:24:15 +0200 (Mon, 12 Sep 2005) New Revision: 765 Modified: ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl Log: If a category is disabled, the whole subtree must be removed from AtoZ listing. Modified: ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl =================================================================== --- ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-08 10:02:19 UTC (rev 764) +++ ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-12 09:24:15 UTC (rev 765) @@ -70,11 +70,20 @@ cat_root_cat_object_map m where c.category_id = a.object_id and c.category_id = i.subcategory_id - and c.enabled_p = '1' and i.category_id = m.category_id and m.object_id = :providerID and not exists ( select 1 + from cat_cat_subcat_trans_index i2 + where i2.category_id in ( + select c2.category_id + from cat_categories c2 + where c2.enabled_p = '0' + ) + and i2.subcategory_id = c.category_id + ) + and not exists ( + select 1 from atoz_cat_blacklist_map b where b.category_id = c.category_id and b.provider_id = :providerID @@ -127,7 +136,6 @@ cat_cat_subcat_trans_index i where c.category_id = a.object_id and c.category_id = i.subcategory_id - and c.enabled_p = '1' and i.category_id = :rootCategoryID and not exists ( select 1 @@ -137,6 +145,16 @@ ) and not exists ( select 1 + from cat_cat_subcat_trans_index i2 + where i2.category_id in ( + select c2.category_id + from cat_categories c2 + where c2.enabled_p = '0' + ) + and i2.subcategory_id = c.category_id + ) + and not exists ( + select 1 from atoz_cat_alias_map b where b.category_id = c.category_id and b.provider_id = :providerID |
From: <ssk...@vh...> - 2005-09-08 10:11:21
|
Author: sskracic Date: 2005-09-08 12:02:19 +0200 (Thu, 08 Sep 2005) New Revision: 764 Modified: releases/1.0.2/ccm-ldn-atoz/application.xml releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl Log: Integrating r763 from trunk (disabled categories should not be visible in AtoZ). Modified: releases/1.0.2/ccm-ldn-atoz/application.xml =================================================================== --- releases/1.0.2/ccm-ldn-atoz/application.xml 2005-09-08 09:59:38 UTC (rev 763) +++ releases/1.0.2/ccm-ldn-atoz/application.xml 2005-09-08 10:02:19 UTC (rev 764) @@ -3,7 +3,7 @@ name="ccm-ldn-atoz" prettyName="A-Z" version="1.0.2" - release="3"> + release="4"> <ccm:dependencies> <ccm:requires name="ccm-core" version="6.1.1"/> <ccm:requires name="ccm-cms" version="6.1.1"/> Modified: releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl =================================================================== --- releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-08 09:59:38 UTC (rev 763) +++ releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-08 10:02:19 UTC (rev 764) @@ -70,6 +70,7 @@ cat_root_cat_object_map m where c.category_id = a.object_id and c.category_id = i.subcategory_id + and c.enabled_p = '1' and i.category_id = m.category_id and m.object_id = :providerID and not exists ( @@ -95,6 +96,7 @@ atoz_cat_alias_map m where c.category_id = m.category_id and c.category_id = a.object_id + and c.enabled_p = '1' and m.provider_id = :providerID } map { id = id; @@ -125,6 +127,7 @@ cat_cat_subcat_trans_index i where c.category_id = a.object_id and c.category_id = i.subcategory_id + and c.enabled_p = '1' and i.category_id = :rootCategoryID and not exists ( select 1 @@ -149,6 +152,7 @@ atoz_cat_alias_map m where c.category_id = m.category_id and c.category_id = a.object_id + and c.enabled_p = '1' and m.provider_id = :providerID } map { id = id; @@ -157,4 +161,4 @@ description = description; sortKey = sort_key; } -} \ No newline at end of file +} |
From: <ssk...@vh...> - 2005-09-08 10:08:47
|
Author: sskracic Date: 2005-09-08 11:59:38 +0200 (Thu, 08 Sep 2005) New Revision: 763 Modified: ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl Log: Disabled categories should not be visible in AtoZ. Modified: ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl =================================================================== --- ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-07 13:56:46 UTC (rev 762) +++ ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl 2005-09-08 09:59:38 UTC (rev 763) @@ -70,6 +70,7 @@ cat_root_cat_object_map m where c.category_id = a.object_id and c.category_id = i.subcategory_id + and c.enabled_p = '1' and i.category_id = m.category_id and m.object_id = :providerID and not exists ( @@ -95,6 +96,7 @@ atoz_cat_alias_map m where c.category_id = m.category_id and c.category_id = a.object_id + and c.enabled_p = '1' and m.provider_id = :providerID } map { id = id; @@ -125,6 +127,7 @@ cat_cat_subcat_trans_index i where c.category_id = a.object_id and c.category_id = i.subcategory_id + and c.enabled_p = '1' and i.category_id = :rootCategoryID and not exists ( select 1 @@ -149,6 +152,7 @@ atoz_cat_alias_map m where c.category_id = m.category_id and c.category_id = a.object_id + and c.enabled_p = '1' and m.provider_id = :providerID } map { id = id; @@ -157,4 +161,4 @@ description = description; sortKey = sort_key; } -} \ No newline at end of file +} |
From: <ss...@vh...> - 2005-09-07 14:05:35
|
Author: sshinde Date: 2005-09-07 15:56:46 +0200 (Wed, 07 Sep 2005) New Revision: 762 Modified: ccm-ldn-aplaws/trunk/bundles/camden/cfg/applications.cfg ccm-ldn-aplaws/trunk/bundles/camden/cfg/web.xml Log: Added the camden specific application to the list. Customized 404 error page configuration.It's provided by ccm-ldn-aplaws-camden rpm package. Modified: ccm-ldn-aplaws/trunk/bundles/camden/cfg/applications.cfg =================================================================== --- ccm-ldn-aplaws/trunk/bundles/camden/cfg/applications.cfg 2005-09-07 12:12:43 UTC (rev 761) +++ ccm-ldn-aplaws/trunk/bundles/camden/cfg/applications.cfg 2005-09-07 13:56:46 UTC (rev 762) @@ -39,3 +39,4 @@ ccm-ldn-xmlfeed ccm-formbuilder-pdf +ccm-ldn-aplaws-camden Modified: ccm-ldn-aplaws/trunk/bundles/camden/cfg/web.xml =================================================================== --- ccm-ldn-aplaws/trunk/bundles/camden/cfg/web.xml 2005-09-07 12:12:43 UTC (rev 761) +++ ccm-ldn-aplaws/trunk/bundles/camden/cfg/web.xml 2005-09-07 13:56:46 UTC (rev 762) @@ -298,10 +298,14 @@ <location>/error/db-not-available.jsp</location> </error-page> - <error-page> <exception-type>java.lang.Exception</exception-type> <location>/error/general.jsp</location> </error-page> + <error-page> + <error-code>404</error-code> + <location>/error/404.jsp</location> + </error-page> + </web-app> |
From: <ssk...@vh...> - 2005-09-07 12:21:47
|
Author: sskracic Date: 2005-09-07 14:12:43 +0200 (Wed, 07 Sep 2005) New Revision: 761 Modified: ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl Log: Allow DCP message to be any (even invalid) HTML. Modified: ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java 2005-09-07 09:49:33 UTC (rev 760) +++ ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java 2005-09-07 12:12:43 UTC (rev 761) @@ -138,7 +138,13 @@ ("dcp-message", new XSLParameterGenerator() { public String generateValue(HttpServletRequest request) { - return Bebop.getConfig().getDcpMessage(); + String msg = Bebop.getConfig().getDcpMessage(); + if (msg != null) { + // We need to escape single quotes, since they're used + // as string delimiters in javascript function. + return msg.replaceAll("'", "\\\\'"); + } + return null; } }); } Modified: ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl =================================================================== --- ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl 2005-09-07 09:49:33 UTC (rev 760) +++ ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl 2005-09-07 12:12:43 UTC (rev 761) @@ -13,8 +13,9 @@ <xsl:choose> <xsl:when test="$dcp-message"> function dcp_hide(e) { - text = document.createTextNode('<xsl:value-of select="$dcp-message"/>'); - e.parentNode.insertBefore(text, e); + div = document.createElement('div'); + div.innerHTML = '<xsl:value-of disable-output-escaping="yes" select="$dcp-message"/>'; + e.parentNode.insertBefore(div, e); e.style.display = 'none'; } </xsl:when> |
From: <ssk...@vh...> - 2005-09-07 09:58:37
|
Author: sskracic Date: 2005-09-07 11:49:33 +0200 (Wed, 07 Sep 2005) New Revision: 760 Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/atoz-index.xsl ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-center-index.xsl ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-admin.xsl ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-index.xsl ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/page.xsl ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/navigation-sitemap.xsl ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/search-index.xsl ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/workspace-index.xsl Log: Ensured that default Aplaws+ theme honours double-click protection Javascript. Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/atoz-index.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/atoz-index.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/atoz-index.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -15,6 +15,7 @@ <xsl:import href="lib/header.xsl"/> <xsl:import href="lib/lib.xsl"/> +<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> <xsl:param name="context-prefix"></xsl:param> <xsl:param name="dispatcher-prefix" /> @@ -35,6 +36,7 @@ </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a> <span class="hide">|</span> <xsl:call-template name="header"/> Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-center-index.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-center-index.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-center-index.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<xsl:stylesheet +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0" @@ -8,7 +8,8 @@ version="1.0" exclude-result-prefixes="bebop cms ui aplaws xsl"> <xsl:import href="../../../../ROOT/__ccm__/apps/content-center/xsl/index.xsl"/> - + <xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> + <xsl:param name="theme-prefix" /> <xsl:variable name="here"><xsl:value-of select="$static-prefix"/>/cms/admin/page</xsl:variable> @@ -22,6 +23,7 @@ <link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/> </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <table id="global-header"> <tr> <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/></td> @@ -57,7 +59,7 @@ <div><xsl:apply-templates select="bebop:structure"/></div> </xsl:when> <xsl:when test="ui:debugPanel"> - <div><xsl:apply-templates select="ui:debugPanel"/></div> + <div><xsl:apply-templates select="ui:debugPanel"/></div> </xsl:when> </xsl:choose> </body> Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-admin.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-admin.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-admin.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -8,6 +8,7 @@ version="1.0" exclude-result-prefixes="bebop cms ui aplaws xsl"> <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/admin.xsl"/> + <xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> <xsl:param name="theme-prefix" /> @@ -30,6 +31,7 @@ <link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/> </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <table id="global-header"> <tr> <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/></td> Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-index.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-index.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/content-section-index.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -9,12 +9,12 @@ exclude-result-prefixes="xsl bebop aplaws ui cms nav" version="1.0"> - <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/> +<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="lib/header.xsl"/> <xsl:import href="lib/lib.xsl"/> <xsl:import href="lib/leftNav.xsl"/> <xsl:import href="types/ContentTypes.xsl"/> - +<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> <xsl:param name="context-prefix"/> <xsl:param name="dispatcher-prefix"/> @@ -38,6 +38,7 @@ </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a> <span class="hide">|</span> <xsl:call-template name="header"/> Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/page.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/page.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/page.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -8,6 +8,7 @@ <xsl:import href="head.xsl"/> <xsl:import href="body.xsl"/> + <xsl:import href="../../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> <xsl:output method="html"/> @@ -21,6 +22,7 @@ </head> <body style="margin: 0em"> + <xsl:call-template name="bebop:dcpJavascript"/> <xsl:call-template name="aplaws:bodyHeader"/> <xsl:call-template name="aplaws:bodyBreadcrumb"/> <xsl:call-template name="aplaws:bodyContent"/> Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/navigation-sitemap.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/navigation-sitemap.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/navigation-sitemap.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<xsl:stylesheet +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" @@ -15,17 +15,18 @@ <xsl:import href="lib/header.xsl"/> <xsl:import href="lib/lib.xsl"/> - +<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> + <xsl:param name="context-prefix"></xsl:param> <xsl:param name="dispatcher-prefix" /> <xsl:param name="theme-prefix" /> -<xsl:output +<xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" doctype-system="http://www.w3.org/TR/html4/loose.dtd" - indent="yes" -/> + indent="yes" +/> @@ -37,6 +38,7 @@ </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a> <span class="hide">|</span> <xsl:call-template name="header"/> Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/search-index.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/search-index.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/search-index.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -16,7 +16,7 @@ <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/> <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/> - + <xsl:param name="context-prefix"/> <xsl:param name="dispatcher-prefix" /> <xsl:param name="theme-prefix" /> @@ -36,6 +36,7 @@ </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a> <span class="hide">|</span> <xsl:call-template name="header"/> @@ -598,6 +599,7 @@ </td> </xsl:template> +<!-- <xsl:template match="bebop:formWidget"> <xsl:element name="input"> <xsl:for-each select="@*"> @@ -607,6 +609,7 @@ </xsl:for-each> </xsl:element> </xsl:template> +--> <xsl:template match="bebop:pageState"> <input> Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/workspace-index.xsl =================================================================== --- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/workspace-index.xsl 2005-09-07 09:45:21 UTC (rev 759) +++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/workspace-index.xsl 2005-09-07 09:49:33 UTC (rev 760) @@ -11,13 +11,13 @@ exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal" version="1.0"> - <xsl:import href="../../../../ROOT/__ccm__/apps/workspace/xsl/index.xsl"/> - <xsl:import href="portal/lib.xsl"/> - <xsl:import href="portal/portlets.xsl"/> - +<xsl:import href="../../../../ROOT/__ccm__/apps/workspace/xsl/index.xsl"/> +<xsl:import href="portal/lib.xsl"/> +<xsl:import href="portal/portlets.xsl"/> <xsl:import href="lib/header.xsl"/> <xsl:import href="lib/lib.xsl"/> - +<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> + <xsl:param name="context-prefix"></xsl:param> <xsl:param name="dispatcher-prefix" /> <xsl:param name="theme-prefix" /> @@ -40,6 +40,7 @@ </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a> <span class="hide">|</span> <xsl:call-template name="header"/> @@ -169,4 +170,4 @@ <metaInformation> <scenarios ><scenario default="yes" name="Scenario2" userelativepaths="yes" externalpreview="no" url="..\XML\newHomepagePortal.xml" htmlbaseurl="http://194.202.210.43:9005/theme/ibm-generic/" outputurl="" processortype="internal" profilemode="0" urlprofilexml="" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/> </metaInformation> ---> \ No newline at end of file +--> |
From: <ssk...@vh...> - 2005-09-07 09:54:37
|
Author: sskracic Date: 2005-09-07 11:45:21 +0200 (Wed, 07 Sep 2005) New Revision: 759 Added: ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl Modified: ccm-cms/trunk/web/__ccm__/static/cms/admin/action-link/action-link.xsl ccm-cms/trunk/web/__ccm__/static/cms/admin/page/page.xsl ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig.java ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig_parameter.properties ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java ccm-core/trunk/web/packages/acs-admin/xsl/split-panel.xsl ccm-core/trunk/web/packages/bebop/xsl/FormWidget.xsl ccm-core/trunk/web/packages/bebop/xsl/Link.xsl ccm-core/trunk/web/packages/bebop/xsl/Page.xsl ccm-core/trunk/web/packages/bebop/xsl/Widget.xsl ccm-core/trunk/web/packages/bebop/xsl/bebop.xsl ccm-core/trunk/web/packages/login/xsl/login_en.xsl ccm-core/trunk/web/packages/ui/xsl/simple-page.xsl Log: The client (javascript) side of double click protection. Whenever a form is submitted or a link is clicked, its DOM container is replaced with a simple node containing text that can be supplied via waf.bebop.dcp_message configuration parameter. If unset, this javascript gimmicky is disabled. Modified: ccm-cms/trunk/web/__ccm__/static/cms/admin/action-link/action-link.xsl =================================================================== --- ccm-cms/trunk/web/__ccm__/static/cms/admin/action-link/action-link.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-cms/trunk/web/__ccm__/static/cms/admin/action-link/action-link.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -6,11 +6,11 @@ > <xsl:template match="bebop:link[@class = 'actionLink']"> <div class="action-link"> - <a href="{@href}"> + <a href="{@href}" onclick="dcp_hide(this);"> <div class="link-icon"/> <xsl:apply-templates/> </a> </div> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: ccm-cms/trunk/web/__ccm__/static/cms/admin/page/page.xsl =================================================================== --- ccm-cms/trunk/web/__ccm__/static/cms/admin/page/page.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-cms/trunk/web/__ccm__/static/cms/admin/page/page.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -7,6 +7,7 @@ > <xsl:import href="../../../../../packages/ui/xsl/debug-panel.xsl"/> + <xsl:import href="../../../../../packages/bebop/xsl/dcp.xsl"/> <xsl:variable name="here"><xsl:value-of select="$static-prefix"/>/cms/admin/page</xsl:variable> @@ -14,6 +15,7 @@ <xsl:template match="bebop:page[@class = 'cms-admin']"> <html xmlns:deditor="http://www.arsdigita.com/deditor/1.0"> <head> + <xsl:call-template name="bebop:dcpJavascript"/> <title><xsl:value-of select="bebop:title"/></title> <link rel="stylesheet" type="text/css" href="{$legacy-asset-prefix}/css/acs-master.css"/> <link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/> @@ -64,4 +66,4 @@ </body> </html> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig.java 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig.java 2005-09-07 09:45:21 UTC (rev 759) @@ -45,6 +45,7 @@ private final Parameter m_page; private final Parameter m_tidy; private final Parameter m_fancyErrors; + private final Parameter m_dcpMessage; public BebopConfig() { m_presenter = new SingletonParameter @@ -63,10 +64,14 @@ Parameter.REQUIRED, Boolean.FALSE); + m_dcpMessage = new StringParameter + ("waf.bebop.dcp_message", Parameter.OPTIONAL, null); + register(m_presenter); register(m_page); register(m_tidy); register(m_fancyErrors); + register(m_dcpMessage); loadInfo(); } @@ -92,4 +97,8 @@ public boolean wantFancyXSLErrors() { return ((Boolean)get(m_fancyErrors)).booleanValue(); } + + public final String getDcpMessage() { + return (String) get(m_dcpMessage); + } } Modified: ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig_parameter.properties =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig_parameter.properties 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/src/com/arsdigita/bebop/BebopConfig_parameter.properties 2005-09-07 09:45:21 UTC (rev 759) @@ -18,3 +18,7 @@ waf.bebop.fancy_xsl_errors.example=true|false waf.bebop.fancy_xsl_errors.format=[boolean] +waf.bebop.dcp_message.title=Form submission message +waf.bebop.dcp_message.purpose=The text which replaces link or form content after the link is clicked or form is submitted +waf.bebop.dcp_message.example=<b>(Please wait ...)</b> +waf.bebop.dcp_message.format=[string] Modified: ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java 2005-09-07 09:45:21 UTC (rev 759) @@ -133,6 +133,14 @@ return com.arsdigita.web.URL.getDispatcherPath(); } }); + + registerXSLParameterGenerator + ("dcp-message", + new XSLParameterGenerator() { + public String generateValue(HttpServletRequest request) { + return Bebop.getConfig().getDcpMessage(); + } + }); } // XXX These need to move somewhere else. Modified: ccm-core/trunk/web/packages/acs-admin/xsl/split-panel.xsl =================================================================== --- ccm-core/trunk/web/packages/acs-admin/xsl/split-panel.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/acs-admin/xsl/split-panel.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -160,8 +160,8 @@ <!-- pads the label of the submit buttons --> <xsl:template match="bebop:formWidget[@type='submit']"> - <input value="   {@value}   "> - <xsl:for-each select="@*[not(name()='value')]"> + <input value="   {@value}   " onclick="dcp_hide(this.form);"> + <xsl:for-each select="@*[name() != 'value' and name() != 'onclick']"> <xsl:attribute name="{name()}"> <xsl:value-of select="."/> </xsl:attribute> @@ -169,4 +169,4 @@ </input> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: ccm-core/trunk/web/packages/bebop/xsl/FormWidget.xsl =================================================================== --- ccm-core/trunk/web/packages/bebop/xsl/FormWidget.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/bebop/xsl/FormWidget.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -3,7 +3,6 @@ <xsl:output method="html" indent="yes"/> - <xsl:template match="bebop:formWidget" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"> <input> @@ -15,5 +14,16 @@ </input> </xsl:template> + <xsl:template match="bebop:formWidget[@type='submit']" + xmlns:bebop="http://www.arsdigita.com/bebop/1.0"> + <input onclick="dcp_hide(this.form);"> + <xsl:for-each select="@*[name() != 'onclick']"> + <xsl:attribute name="{name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:for-each> + </input> + </xsl:template> + </xsl:stylesheet> Modified: ccm-core/trunk/web/packages/bebop/xsl/Link.xsl =================================================================== --- ccm-core/trunk/web/packages/bebop/xsl/Link.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/bebop/xsl/Link.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -14,8 +14,8 @@ </xsl:when> <xsl:otherwise> - <a> - <xsl:copy-of select="@*[name() != 'href_no_javascript']"/> + <a onclick="dcp_hide(this);"> + <xsl:copy-of select="@*[name() != 'href_no_javascript' and name() != 'onclick']"/> <xsl:apply-templates/> </a> </xsl:otherwise> @@ -37,8 +37,8 @@ </img> </a> <xsl:text> </xsl:text> - <a> - <xsl:copy-of select="@*[name() != 'href_no_javascript']"/> + <a onclick="dcp_hide(this);"> + <xsl:copy-of select="@*[name() != 'href_no_javascript' and name() != 'onclick']"/> <xsl:apply-templates/> </a> </xsl:otherwise> Modified: ccm-core/trunk/web/packages/bebop/xsl/Page.xsl =================================================================== --- ccm-core/trunk/web/packages/bebop/xsl/Page.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/bebop/xsl/Page.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -42,6 +42,7 @@ <xsl:call-template name="bebop:pageCSS"/> </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <h2><xsl:call-template name="bebop:pageTitle"/></h2> <xsl:apply-templates select="*[position()>1]"/> </body> Modified: ccm-core/trunk/web/packages/bebop/xsl/Widget.xsl =================================================================== --- ccm-core/trunk/web/packages/bebop/xsl/Widget.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/bebop/xsl/Widget.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -21,5 +21,16 @@ </xsl:element> </xsl:template> + <xsl:template match="bebop:formWidget[@type='submit']" + xmlns:bebop="http://www.arsdigita.com/bebop/1.0"> + <input onclick="dcp_hide(this.form);"> + <xsl:for-each select="@*[name() != 'onclick']"> + <xsl:attribute name="{name()}"> + <xsl:value-of select="."/> + </xsl:attribute> + </xsl:for-each> + </input> + </xsl:template> + </xsl:stylesheet> Modified: ccm-core/trunk/web/packages/bebop/xsl/bebop.xsl =================================================================== --- ccm-core/trunk/web/packages/bebop/xsl/bebop.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/bebop/xsl/bebop.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -40,12 +40,14 @@ <xsl:import href="Widget.xsl"/> <xsl:import href="SegmentedPanel.xsl"/> <xsl:import href="DateTime.xsl"/> +<xsl:import href="dcp.xsl"/> <!-- solid line --> <xsl:template match="bebop:solidLine"> <hr /> </xsl:template> + </xsl:stylesheet> Added: ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl =================================================================== --- ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<xsl:stylesheet + xmlns:bebop="http://www.arsdigita.com/bebop/1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" + exclude-result-prefixes="bebop"> + +<xsl:output method="html" indent="yes"/> + +<xsl:param name="dcp-message"/> + +<xsl:template name="bebop:dcpJavascript"> + <script language="javascript"> + <xsl:choose> + <xsl:when test="$dcp-message"> + function dcp_hide(e) { + text = document.createTextNode('<xsl:value-of select="$dcp-message"/>'); + e.parentNode.insertBefore(text, e); + e.style.display = 'none'; + } + </xsl:when> + <xsl:otherwise> + function dcp_hide(e) { } + </xsl:otherwise> + </xsl:choose> + </script> +</xsl:template> + +</xsl:stylesheet> Property changes on: ccm-core/trunk/web/packages/bebop/xsl/dcp.xsl ___________________________________________________________________ Name: svn:keywords + Id Author URL Modified: ccm-core/trunk/web/packages/login/xsl/login_en.xsl =================================================================== --- ccm-core/trunk/web/packages/login/xsl/login_en.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/login/xsl/login_en.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -27,6 +27,7 @@ </head> <body link="#000066" vlink="#333399" bgcolor="#FFFFFF"> + <xsl:call-template name="bebop:dcpJavascript"/> <xsl:apply-templates select="ui:userBanner" /> <p/> Modified: ccm-core/trunk/web/packages/ui/xsl/simple-page.xsl =================================================================== --- ccm-core/trunk/web/packages/ui/xsl/simple-page.xsl 2005-09-02 15:45:21 UTC (rev 758) +++ ccm-core/trunk/web/packages/ui/xsl/simple-page.xsl 2005-09-07 09:45:21 UTC (rev 759) @@ -4,6 +4,7 @@ xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"> + <xsl:import href="../../bebop/xsl/dcp.xsl"/> <xsl:output method="html" indent="yes"/> <xsl:param name="context-prefix"/> @@ -15,6 +16,7 @@ <xsl:call-template name="bebop:pageCSS"/> </head> <body> + <xsl:call-template name="bebop:dcpJavascript"/> <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> <td> |
From: <ssk...@vh...> - 2005-09-02 15:54:08
|
Author: sskracic Date: 2005-09-02 17:45:21 +0200 (Fri, 02 Sep 2005) New Revision: 758 Modified: ccm-formbuilder-pdf/trunk/src/com/arsdigita/formbuilder/pdf/Converter.java Log: NFC: finishing the wildcard import trim work. This file had DOS newlines so it had been left out at the previous attempt. Modified: ccm-formbuilder-pdf/trunk/src/com/arsdigita/formbuilder/pdf/Converter.java =================================================================== --- ccm-formbuilder-pdf/trunk/src/com/arsdigita/formbuilder/pdf/Converter.java 2005-09-02 15:25:32 UTC (rev 757) +++ ccm-formbuilder-pdf/trunk/src/com/arsdigita/formbuilder/pdf/Converter.java 2005-09-02 15:45:21 UTC (rev 758) @@ -1,175 +1,181 @@ -/* - * Copyright (C) 2004 Red Hat Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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.formbuilder.pdf; - -import com.arsdigita.util.UncheckedWrapperException; - -import java.io.*; -import java.util.Iterator; -import java.util.Vector; - -import javax.servlet.ServletException; -import javax.servlet.http.*; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.stream.StreamSource; - -import org.apache.fop.apps.Driver; -import org.apache.log4j.Logger; -import org.w3c.dom.*; - -/** - * Creation History Start - @Author Name: CS Gupta - @Create Date: 23/11/2004 - @Class Name: Converter.java - @Purpose: This servlet class uses Apache's FOP and format xml data in PDF Format - @Company: Infoaxon Technology - @Copyright: Copyright (c) 2004 - @Version : 1.0 - * Creation History End - * - **/ - -public class Converter extends HttpServlet -{ - private static final Logger s_log = Logger.getLogger(Converter.class); - public static final String BASE_DATA_OBJECT_TYPE = - "com.arsdigita.formbuilder.pdf.Converter"; - - private TransformerFactory transformerFactory; - - public Converter() { } - - public void init() throws ServletException - { - transformerFactory = TransformerFactory.newInstance(); - } - - //Setup FOP - public void doGet(HttpServletRequest req, HttpServletResponse res) - throws ServletException, IOException - { - s_log.debug("Converter-doGet(HttpServletRequest,HttpServletResponse)-Enter"); - HttpSession session=req.getSession(); - if (s_log.isDebugEnabled()) { - s_log.debug("Using session: " + session.getId()); - } - - //Request form data from PDFListener. Form data is stored in Vector inside Vector - //This is main Vecor that contains inner Vector - Vector objOuterFormData = PDFListener.getFormData(session.getId()); - if (null == objOuterFormData) { - s_log.error("Converter called with no FormData in session"); - return; - } - - Iterator iter=objOuterFormData.iterator(); - - if (s_log.isDebugEnabled()) { - s_log.debug("Dumping FormData"); - while (iter.hasNext()) { - Vector inner = (Vector) iter.next(); - s_log.debug(inner.firstElement().toString() + ": " + - inner.lastElement().toString()); - } - - iter = objOuterFormData.iterator(); - } - - //This is inner Vector for Form Data that contains Caption and Value - Vector objInnerFormData=null; - - byte[] bytes = "<?xml version='1.0' encoding='UTF-8'?><Document/>".getBytes(); - ByteArrayInputStream objByteArrayInputStream = new ByteArrayInputStream(bytes); - - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db; - Document xmldoc; - try { - db = dbf.newDocumentBuilder(); - xmldoc = db.parse(objByteArrayInputStream); - } catch (Exception ex) { - throw new UncheckedWrapperException(ex); - } - - Node grpRoot=xmldoc.getDocumentElement(); - //Iterating objOuterFormData Vector - while (iter.hasNext()) - { - objInnerFormData=new Vector(); - objInnerFormData=(Vector)iter.next(); - //This is for Caption - String strkey =(String)objInnerFormData.firstElement(); - //This is for Value - String strValue=(String)objInnerFormData.lastElement(); - - Element root = xmldoc.createElement("Section"); - - Node captionNode = xmldoc.createElement("Caption"); - Text captionText = xmldoc.createTextNode(strkey); - captionNode.appendChild(captionText); - - Node valueNode = xmldoc.createElement("Value"); - Text valueText = xmldoc.createTextNode(strValue); - valueNode.appendChild(valueText); - - root.appendChild(captionNode); - root.appendChild(valueNode); - grpRoot.appendChild(root); - } - - res.setContentType("application/pdf"); - Driver driver = new Driver(); - driver.setRenderer(1); - //Setup a buffer to obtain the content length - ByteArrayOutputStream out = new ByteArrayOutputStream(); - driver.setOutputStream(out); - - //Setup Transformer - javax.xml.transform.Source xsltSrc = - new StreamSource(new File(PDFConfig.retrieve().getXSLFile())); - - try { - Transformer transformer = - transformerFactory.newTransformer(xsltSrc); - - //Make sure the XSL transformation's result is piped through to FOP - javax.xml.transform.Result result = - new SAXResult(driver.getContentHandler()); - //Setup input and start the transformation and rendering process - transformer.transform(new DOMSource(xmldoc), result); - } catch (Exception ex) { - throw new UncheckedWrapperException(ex); - } - - //Prepare response - res.setContentLength(out.size()); - //Send content to Browser - res.getOutputStream().write(out.toByteArray()); - res.getOutputStream().flush(); - - s_log.debug("Converter-doGet(HttpServletRequest,HttpServletResponse)-Exit"); - } -} +/* + * Copyright (C) 2004 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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.formbuilder.pdf; + +import com.arsdigita.util.UncheckedWrapperException; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.Vector; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.stream.StreamSource; +import org.apache.fop.apps.Driver; +import org.apache.log4j.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.Text; + +/** + * Creation History Start + @Author Name: CS Gupta + @Create Date: 23/11/2004 + @Class Name: Converter.java + @Purpose: This servlet class uses Apache's FOP and format xml data in PDF Format + @Company: Infoaxon Technology + @Copyright: Copyright (c) 2004 + @Version : 1.0 + * Creation History End + * + **/ + +public class Converter extends HttpServlet +{ + private static final Logger s_log = Logger.getLogger(Converter.class); + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.formbuilder.pdf.Converter"; + + private TransformerFactory transformerFactory; + + public Converter() { } + + public void init() throws ServletException + { + transformerFactory = TransformerFactory.newInstance(); + } + + //Setup FOP + public void doGet(HttpServletRequest req, HttpServletResponse res) + throws ServletException, IOException + { + s_log.debug("Converter-doGet(HttpServletRequest,HttpServletResponse)-Enter"); + HttpSession session=req.getSession(); + if (s_log.isDebugEnabled()) { + s_log.debug("Using session: " + session.getId()); + } + + //Request form data from PDFListener. Form data is stored in Vector inside Vector + //This is main Vecor that contains inner Vector + Vector objOuterFormData = PDFListener.getFormData(session.getId()); + if (null == objOuterFormData) { + s_log.error("Converter called with no FormData in session"); + return; + } + + Iterator iter=objOuterFormData.iterator(); + + if (s_log.isDebugEnabled()) { + s_log.debug("Dumping FormData"); + while (iter.hasNext()) { + Vector inner = (Vector) iter.next(); + s_log.debug(inner.firstElement().toString() + ": " + + inner.lastElement().toString()); + } + + iter = objOuterFormData.iterator(); + } + + //This is inner Vector for Form Data that contains Caption and Value + Vector objInnerFormData=null; + + byte[] bytes = "<?xml version='1.0' encoding='UTF-8'?><Document/>".getBytes(); + ByteArrayInputStream objByteArrayInputStream = new ByteArrayInputStream(bytes); + + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db; + Document xmldoc; + try { + db = dbf.newDocumentBuilder(); + xmldoc = db.parse(objByteArrayInputStream); + } catch (Exception ex) { + throw new UncheckedWrapperException(ex); + } + + Node grpRoot=xmldoc.getDocumentElement(); + //Iterating objOuterFormData Vector + while (iter.hasNext()) + { + objInnerFormData=new Vector(); + objInnerFormData=(Vector)iter.next(); + //This is for Caption + String strkey =(String)objInnerFormData.firstElement(); + //This is for Value + String strValue=(String)objInnerFormData.lastElement(); + + Element root = xmldoc.createElement("Section"); + + Node captionNode = xmldoc.createElement("Caption"); + Text captionText = xmldoc.createTextNode(strkey); + captionNode.appendChild(captionText); + + Node valueNode = xmldoc.createElement("Value"); + Text valueText = xmldoc.createTextNode(strValue); + valueNode.appendChild(valueText); + + root.appendChild(captionNode); + root.appendChild(valueNode); + grpRoot.appendChild(root); + } + + res.setContentType("application/pdf"); + Driver driver = new Driver(); + driver.setRenderer(1); + //Setup a buffer to obtain the content length + ByteArrayOutputStream out = new ByteArrayOutputStream(); + driver.setOutputStream(out); + + //Setup Transformer + javax.xml.transform.Source xsltSrc = + new StreamSource(new File(PDFConfig.retrieve().getXSLFile())); + + try { + Transformer transformer = + transformerFactory.newTransformer(xsltSrc); + + //Make sure the XSL transformation's result is piped through to FOP + javax.xml.transform.Result result = + new SAXResult(driver.getContentHandler()); + //Setup input and start the transformation and rendering process + transformer.transform(new DOMSource(xmldoc), result); + } catch (Exception ex) { + throw new UncheckedWrapperException(ex); + } + + //Prepare response + res.setContentLength(out.size()); + //Send content to Browser + res.getOutputStream().write(out.toByteArray()); + res.getOutputStream().flush(); + + s_log.debug("Converter-doGet(HttpServletRequest,HttpServletResponse)-Exit"); + } +} |
From: <ssk...@vh...> - 2005-09-02 15:34:26
|
Author: sskracic Date: 2005-09-02 17:25:32 +0200 (Fri, 02 Sep 2005) New Revision: 757 Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java Log: NFC: completing the import trimming. Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java 2005-09-02 15:25:32 UTC (rev 757) @@ -16,12 +16,18 @@ package com.arsdigita.auth.http; -import java.io.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import java.security.*; -import javax.crypto.*; +import java.io.IOException; +import java.net.URLEncoder; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import java.security.GeneralSecurityException; +import java.security.PrivateKey; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.ShortBufferException; import sun.misc.BASE64Encoder; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java 2005-09-02 15:25:32 UTC (rev 757) @@ -16,8 +16,8 @@ package com.arsdigita.auth.http; -import java.net.*; -import java.security.*; +import java.net.InetAddress; +import java.net.UnknownHostException; import com.arsdigita.util.Assert; import com.arsdigita.util.UncheckedWrapperException; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,7 +15,8 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.RequestLocal; +import com.arsdigita.bebop.SimpleContainer; public class AddUserPane extends SimpleContainer { public AddUserPane() { Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,8 +15,6 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.auth.http.*; - import com.arsdigita.bebop.BoxPanel; import com.arsdigita.bebop.Component; import com.arsdigita.bebop.ControlLink; @@ -27,18 +25,21 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.list.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.list.ListCellRenderer; +import com.arsdigita.bebop.list.ListModel; +import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.*; -import com.arsdigita.persistence.*; - +import com.arsdigita.kernel.User; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.Filter; +import com.arsdigita.persistence.SessionManager; import java.math.BigDecimal; - import javax.servlet.ServletException; - import org.apache.log4j.Category; public class EditUserPane extends SimpleContainer { Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -1,7 +1,7 @@ /* * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved. * - * The contents of this file are subject to the ArsDigita Public + * The contents of this file are subject to the ArsDigita Public * License (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of * the License at http://www.arsdigita.com/ADPL.txt @@ -20,24 +20,28 @@ import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.List; +import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.Page; import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.list.*; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.FileUpload; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.list.ListCellRenderer; +import com.arsdigita.bebop.list.ListModel; +import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.dispatcher.MultipartHttpServletRequest; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.Iterator; +import java.util.Vector; +import org.apache.log4j.Logger; -import org.apache.log4j.Logger; - public class UpdateUsersForm extends Form implements FormProcessListener, ListCellRenderer { @@ -156,7 +160,7 @@ Vector invalidUsers = new Vector(); m_failedUsers.set( ps, failedUsers ); m_invalidUsers.set( ps, invalidUsers ); - + while (UserCSVEntry.hasMore()) { UserCSVEntry entry = UserCSVEntry.nextEntry(); if (entry == null) { Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,17 +15,17 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.auth.http.*; +import com.arsdigita.auth.http.UserLogin; -import com.arsdigita.persistence.metadata.*; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.kernel.User; import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.EmailAddress; import com.arsdigita.util.Assert; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Reader; +import java.util.ArrayList; import org.apache.log4j.Logger; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,13 +15,25 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.auth.http.*; import com.arsdigita.auth.http.UserLogin; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.kernel.*; +import com.arsdigita.auth.http.UserLogin; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.RequestLocal; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.parameters.EmailParameter; +import com.arsdigita.bebop.parameters.NotEmptyValidationListener; +import com.arsdigita.kernel.EmailAddress; +import com.arsdigita.kernel.PersonName; +import com.arsdigita.kernel.UserAuthentication; +import com.arsdigita.kernel.User; import javax.mail.internet.InternetAddress; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -1,7 +1,7 @@ /* * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved. * - * The contents of this file are subject to the ArsDigita Public + * The contents of this file are subject to the ArsDigita Public * License (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of * the License at http://www.arsdigita.com/ADPL.txt @@ -12,16 +12,23 @@ * rights and limitations under the License. * */ - + package com.arsdigita.auth.http.ui; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.persistence.*; +import com.arsdigita.bebop.BoxPanel; +import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.event.PrintEvent; +import com.arsdigita.bebop.event.PrintListener; +import com.arsdigita.bebop.form.Option; +import com.arsdigita.bebop.form.SingleSelect; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.UncheckedWrapperException; - import java.util.TooManyListenersException; public class UserManageForm extends Form { @@ -36,7 +43,7 @@ private Submit m_submit = new Submit( "Add/Edit User" ); private ColumnPanel m_editForm = new ColumnPanel( 2 ); - + public UserManageForm() { super( FORM_NAME, new BoxPanel( BoxPanel.VERTICAL ) ); Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,21 +18,16 @@ */ package com.arsdigita.simplesurvey; - -import com.arsdigita.kernel.*; - -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; - -import com.arsdigita.domain.*; - -import com.arsdigita.formbuilder.*; - import com.arsdigita.db.Sequences; - +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; - /** * A SurveyAnswer object represents a response by a user to * a survey at a certain point in time. A survey response consists Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,9 +18,13 @@ */ package com.arsdigita.simplesurvey; -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.LegacyInitializer; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; /** * The CMS initializer. Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,27 +18,16 @@ */ package com.arsdigita.simplesurvey; -import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.loader.PackageLoader; -import com.arsdigita.db.*; -import com.arsdigita.domain.*; -import com.arsdigita.mimetypes.*; -import com.arsdigita.util.*; -import com.arsdigita.util.config.*; -import com.arsdigita.util.csv.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; -import com.arsdigita.portal.*; -import com.arsdigita.web.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.sql.*; - +import com.arsdigita.persistence.DataObject; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.web.Application; +import com.arsdigita.web.ApplicationSetup; +import com.arsdigita.web.ApplicationType; import org.apache.log4j.Logger; /** Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,21 +18,20 @@ */ package com.arsdigita.simplesurvey; - -import com.arsdigita.kernel.*; - -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; - -import com.arsdigita.domain.*; - -import com.arsdigita.formbuilder.*; - - +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.kernel.User; +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; import java.util.Date; - /** * A SurveyResponse object represents a response by a user to * a survey at a certain point in time. A survey response consists Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -22,10 +22,13 @@ import com.arsdigita.simplesurvey.Poll; import com.arsdigita.simplesurvey.ui.SurveyProcessListener; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.xml.*; +import com.arsdigita.bebop.BlockStylable; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.MetaForm; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.form.Hidden; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.parameters.BigDecimalParameter; /** Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java 2005-09-02 15:25:32 UTC (rev 757) @@ -22,7 +22,10 @@ import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.formbuilder.*; +import com.arsdigita.formbuilder.PersistentComponent; +import com.arsdigita.formbuilder.PersistentForm; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; import com.arsdigita.kernel.KernelHelper; import com.arsdigita.domain.DataObjectNotFoundException; @@ -30,7 +33,9 @@ import com.arsdigita.persistence.OID; import java.util.Map; import java.util.HashMap; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.RequestLocal; import com.arsdigita.simplesurvey.Survey; import com.arsdigita.simplesurvey.Response; Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java 2005-09-02 15:25:32 UTC (rev 757) @@ -37,7 +37,9 @@ import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.formbuilder.*; +import com.arsdigita.formbuilder.PersistentDate; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; import com.arsdigita.formbuilder.ui.ControlEditor; import com.arsdigita.formbuilder.util.FormBuilderUtil; import com.arsdigita.formbuilder.PersistentLabel; |
From: <ssk...@vh...> - 2005-09-02 14:35:50
|
Author: sskracic Date: 2005-09-02 16:26:56 +0200 (Fri, 02 Sep 2005) New Revision: 756 Modified: ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/Loader.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Initializer.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Loader.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/Loader.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Initializer.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Initializer.java Log: NFC: trimming wildcard imports in ccm-ldn-* apps. Modified: ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/Loader.java =================================================================== --- ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/Loader.java 2005-09-02 14:12:21 UTC (rev 755) +++ ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/Loader.java 2005-09-02 14:26:56 UTC (rev 756) @@ -5,12 +5,12 @@ * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -18,29 +18,16 @@ package com.arsdigita.london.atoz; -import com.arsdigita.db.*; -import com.arsdigita.domain.*; -import com.arsdigita.runtime.*; -import com.arsdigita.loader.*; -import com.arsdigita.mimetypes.*; -import com.arsdigita.util.*; -import com.arsdigita.util.config.*; -import com.arsdigita.util.csv.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; -import com.arsdigita.portal.*; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.loader.PackageLoader; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.runtime.ScriptContext; import com.arsdigita.web.Application; import com.arsdigita.web.ApplicationSetup; import com.arsdigita.web.ApplicationType; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.sql.*; - import org.apache.log4j.Logger; /** @@ -69,7 +56,7 @@ private void setupAtoZ() { ApplicationSetup setup = new ApplicationSetup(s_log); - + setup.setApplicationObjectType(AtoZ.BASE_DATA_OBJECT_TYPE); setup.setKey("atoz"); setup.setTitle("A-Z"); @@ -82,7 +69,7 @@ }); ApplicationType type = setup.run(); type.save(); - + if (!Application.isInstalled(AtoZ.BASE_DATA_OBJECT_TYPE, "/atoz/")) { Application app = Modified: ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Initializer.java =================================================================== --- ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Initializer.java 2005-09-02 14:12:21 UTC (rev 755) +++ ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Initializer.java 2005-09-02 14:26:56 UTC (rev 756) @@ -18,9 +18,13 @@ package com.arsdigita.london.rss; -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.LegacyInitializer; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; /** * The CMS initializer. Modified: ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Loader.java =================================================================== --- ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Loader.java 2005-09-02 14:12:21 UTC (rev 755) +++ ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Loader.java 2005-09-02 14:26:56 UTC (rev 756) @@ -18,26 +18,8 @@ package com.arsdigita.london.rss; -import com.arsdigita.db.*; -import com.arsdigita.domain.*; -import com.arsdigita.runtime.*; -import com.arsdigita.loader.*; -import com.arsdigita.mimetypes.*; -import com.arsdigita.util.*; -import com.arsdigita.util.config.*; -import com.arsdigita.util.csv.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; -import com.arsdigita.portal.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.sql.*; - +import com.arsdigita.loader.PackageLoader; +import com.arsdigita.runtime.ScriptContext; import org.apache.log4j.Logger; /** Modified: ccm-ldn-search/trunk/src/com/arsdigita/london/search/Loader.java =================================================================== --- ccm-ldn-search/trunk/src/com/arsdigita/london/search/Loader.java 2005-09-02 14:12:21 UTC (rev 755) +++ ccm-ldn-search/trunk/src/com/arsdigita/london/search/Loader.java 2005-09-02 14:26:56 UTC (rev 756) @@ -5,12 +5,12 @@ * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -18,29 +18,16 @@ package com.arsdigita.london.search; -import com.arsdigita.db.*; -import com.arsdigita.domain.*; -import com.arsdigita.runtime.*; -import com.arsdigita.loader.*; -import com.arsdigita.mimetypes.*; -import com.arsdigita.util.*; -import com.arsdigita.util.config.*; -import com.arsdigita.util.csv.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; -import com.arsdigita.portal.*; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.loader.PackageLoader; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.runtime.ScriptContext; import com.arsdigita.web.Application; import com.arsdigita.web.ApplicationSetup; import com.arsdigita.web.ApplicationType; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.sql.*; - import org.apache.log4j.Logger; /** @@ -69,7 +56,7 @@ private void setupSearch() { ApplicationSetup setup = new ApplicationSetup(s_log); - + setup.setApplicationObjectType(Search.BASE_DATA_OBJECT_TYPE); setup.setKey("search"); setup.setTitle("Search"); @@ -82,7 +69,7 @@ }); ApplicationType type = setup.run(); type.save(); - + if (!Application.isInstalled(Search.BASE_DATA_OBJECT_TYPE, "/search/")) { Application app = Modified: ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Initializer.java =================================================================== --- ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Initializer.java 2005-09-02 14:12:21 UTC (rev 755) +++ ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Initializer.java 2005-09-02 14:26:56 UTC (rev 756) @@ -5,117 +5,121 @@ * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * 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.theme; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.bebop.page.PageTransformer; -import com.arsdigita.templating.PatternStylesheetResolver; -import com.arsdigita.london.subsite.SubsiteConfig; -import com.arsdigita.london.theme.ui.ThemeXSLParameterGenerator; -import com.arsdigita.london.subsite.Subsite; -import com.arsdigita.london.theme.util.ThemePublishedFileManager; -import com.arsdigita.london.theme.util.ThemeDevelopmentFileManager; -import com.arsdigita.domain.DomainObjectInstantiator; -import com.arsdigita.domain.DomainObject; -import com.arsdigita.kernel.ACSObjectInstantiator; -import com.arsdigita.persistence.DataObject; -import org.apache.log4j.Logger; - - -/** - * The Theme Directory initializer. - * - * @author Randy Graebner <ra...@re...> - * @version $Id$ - */ -public class Initializer extends CompoundInitializer { - public final static String versionId = - "$Id$" + - "$Author$" + - "$DateTime: 2004/03/16 07:06:30 $"; - - private static Logger s_log = - Logger.getLogger(Initializer.class); - - public Initializer() { - final String url = RuntimeConfig.getConfig().getJDBCURL(); - final int database = DbHelper.getDatabaseFromURL(url); - - add(new PDLInitializer - (new ManifestSource - ("ccm-ldn-theme.pdl.mf", - new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl")))); - } - - public void init(DomainInitEvent evt) { - PatternStylesheetResolver.registerPatternGenerator( - "theme", - new ThemePatternGenerator() - ); - - PatternStylesheetResolver.registerPatternGenerator( - "themedir", - new ThemeDirectoryPatternGenerator() - ); - - PageTransformer.registerXSLParameterGenerator - ("theme-prefix", new ThemeXSLParameterGenerator()); - - // here we add instantiators for our DomainObjects that do - // not extend ACSObject - DomainObjectInstantiator instantiator = - new DomainObjectInstantiator() { - public DomainObject doNewInstance(DataObject dataObject) { - return new ThemeFile(dataObject); - } - }; - evt.getFactory().registerInstantiator(ThemeFile.BASE_DATA_OBJECT_TYPE, - instantiator); - - evt.getFactory().registerInstantiator( - ThemeApplication.BASE_DATA_OBJECT_TYPE, - new ACSObjectInstantiator() { - public DomainObject doNewInstance(DataObject dataObject) { - return new ThemeApplication(dataObject); - } - }); - } - - public void init(LegacyInitEvent evt) { - // This sets up the subsite for so that the form will include - // all of the themes already in the database - ThemeCollection collection = ThemeCollection.getAllThemes(); - collection.addNotEqualsFilter(Theme.LAST_PUBLISHED_USER, null); - SubsiteConfig config = Subsite.getConfig(); - while (collection.next()) { - config.addTheme(collection.getURL(), collection.getTitle()); - } - - // start thread for monitoring queue - int devStartupDelay = ThemeApplication.getConfig() - .getThemeDevFileWatchStartupDelay().intValue(); - int devPollDelay = ThemeApplication.getConfig() - .getThemeDevFileWatchPollDelay().intValue(); - int pubStartupDelay = ThemeApplication.getConfig() - .getThemePubFileWatchStartupDelay().intValue(); - int pubPollDelay = ThemeApplication.getConfig() - .getThemePubFileWatchPollDelay().intValue(); - ThemePublishedFileManager.startWatchingFiles - (pubStartupDelay, pubPollDelay, null); - ThemeDevelopmentFileManager.startWatchingFiles - (devStartupDelay, devPollDelay, null); - } -} + +package com.arsdigita.london.theme; + +import com.arsdigita.bebop.page.PageTransformer; +import com.arsdigita.db.DbHelper; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.london.subsite.Subsite; +import com.arsdigita.london.subsite.SubsiteConfig; +import com.arsdigita.london.theme.ui.ThemeXSLParameterGenerator; +import com.arsdigita.london.theme.util.ThemeDevelopmentFileManager; +import com.arsdigita.london.theme.util.ThemePublishedFileManager; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.DomainInitEvent; +import com.arsdigita.runtime.LegacyInitEvent; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.templating.PatternStylesheetResolver; +import org.apache.log4j.Logger; + +/** + * The Theme Directory initializer. + * + * @author Randy Graebner <ra...@re...> + * @version $Id$ + */ +public class Initializer extends CompoundInitializer { + public final static String versionId = + "$Id$" + + "$Author$" + + "$DateTime: 2004/03/16 07:06:30 $"; + + private static Logger s_log = + Logger.getLogger(Initializer.class); + + public Initializer() { + final String url = RuntimeConfig.getConfig().getJDBCURL(); + final int database = DbHelper.getDatabaseFromURL(url); + + add(new PDLInitializer + (new ManifestSource + ("ccm-ldn-theme.pdl.mf", + new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl")))); + } + + public void init(DomainInitEvent evt) { + PatternStylesheetResolver.registerPatternGenerator( + "theme", + new ThemePatternGenerator() + ); + + PatternStylesheetResolver.registerPatternGenerator( + "themedir", + new ThemeDirectoryPatternGenerator() + ); + + PageTransformer.registerXSLParameterGenerator + ("theme-prefix", new ThemeXSLParameterGenerator()); + + // here we add instantiators for our DomainObjects that do + // not extend ACSObject + DomainObjectInstantiator instantiator = + new DomainObjectInstantiator() { + public DomainObject doNewInstance(DataObject dataObject) { + return new ThemeFile(dataObject); + } + }; + evt.getFactory().registerInstantiator(ThemeFile.BASE_DATA_OBJECT_TYPE, + instantiator); + + evt.getFactory().registerInstantiator( + ThemeApplication.BASE_DATA_OBJECT_TYPE, + new ACSObjectInstantiator() { + public DomainObject doNewInstance(DataObject dataObject) { + return new ThemeApplication(dataObject); + } + }); + } + + public void init(LegacyInitEvent evt) { + // This sets up the subsite for so that the form will include + // all of the themes already in the database + ThemeCollection collection = ThemeCollection.getAllThemes(); + collection.addNotEqualsFilter(Theme.LAST_PUBLISHED_USER, null); + SubsiteConfig config = Subsite.getConfig(); + while (collection.next()) { + config.addTheme(collection.getURL(), collection.getTitle()); + } + + // start thread for monitoring queue + int devStartupDelay = ThemeApplication.getConfig() + .getThemeDevFileWatchStartupDelay().intValue(); + int devPollDelay = ThemeApplication.getConfig() + .getThemeDevFileWatchPollDelay().intValue(); + int pubStartupDelay = ThemeApplication.getConfig() + .getThemePubFileWatchStartupDelay().intValue(); + int pubPollDelay = ThemeApplication.getConfig() + .getThemePubFileWatchPollDelay().intValue(); + ThemePublishedFileManager.startWatchingFiles + (pubStartupDelay, pubPollDelay, null); + ThemeDevelopmentFileManager.startWatchingFiles + (devStartupDelay, devPollDelay, null); + } +} Modified: ccm-ldn-util/trunk/src/com/arsdigita/london/util/Initializer.java =================================================================== --- ccm-ldn-util/trunk/src/com/arsdigita/london/util/Initializer.java 2005-09-02 14:12:21 UTC (rev 755) +++ ccm-ldn-util/trunk/src/com/arsdigita/london/util/Initializer.java 2005-09-02 14:26:56 UTC (rev 756) @@ -5,12 +5,12 @@ * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -18,10 +18,13 @@ package com.arsdigita.london.util; -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - +import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.DataInitEvent; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; import org.apache.log4j.Logger; /** @@ -48,10 +51,10 @@ ("ccm-ldn-util.pdl.mf", new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl")))); } - + public void init(DataInitEvent ev) { super.init(ev); - + } - + } |
Author: sskracic Date: 2005-09-02 16:12:21 +0200 (Fri, 02 Sep 2005) New Revision: 755 Modified: ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java Log: NFC: Trimming wildcard imports in all content types. Modified: ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java =================================================================== --- ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java =================================================================== --- ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java =================================================================== --- ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,8 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; - /** * The CMS initializer. * @@ -45,7 +39,7 @@ Bookmark.BASE_DATA_OBJECT_TYPE); } public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Bookmark.xsl" }; } Modified: ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java =================================================================== --- ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,12 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; import org.apache.log4j.Logger; /** Modified: ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java =================================================================== --- ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,8 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; - /** * The CMS initializer. * @@ -45,7 +39,7 @@ FAQItem.BASE_DATA_OBJECT_TYPE); } public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/FAQItem.xsl" }; } Modified: ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java =================================================================== --- ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -43,9 +38,9 @@ super("ccm-cms-types-glossaryitem.pdl.mf", GlossaryItem.BASE_DATA_OBJECT_TYPE); } - + public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/GlossaryItem.xsl" }; } Modified: ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java =================================================================== --- ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -43,9 +38,9 @@ super("ccm-cms-types-inlinesite.pdl.mf", InlineSite.BASE_DATA_OBJECT_TYPE); } - + public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/InlineSite.xsl" }; } Modified: ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java =================================================================== --- ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - - /** * Initializer * Modified: ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java =================================================================== --- ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java =================================================================== --- ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java =================================================================== --- ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,10 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - /** * The CMS initializer. * Modified: ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java =================================================================== --- ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,19 +18,15 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.*; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; -import com.arsdigita.cms.lifecycle.*; -import com.arsdigita.cms.workflow.*; -import com.arsdigita.util.*; -import com.arsdigita.workflow.simple.*; - +import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentType; +import com.arsdigita.cms.lifecycle.LifecycleDefinition; +import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.URLParameter; - -import java.io.InputStream; -import java.net.URL; +import com.arsdigita.workflow.simple.WorkflowTemplate; import java.net.MalformedURLException; +import java.net.URL; /** * Loader. @@ -52,13 +48,12 @@ return TYPES; } - private URLParameter m_template; public MultiPartArticleLoader() { try { m_template = new URLParameter - ("com.arsdigita.cms.contenttypes.mparticle.template", + ("com.arsdigita.cms.contenttypes.mparticle.template", Parameter.REQUIRED, new URL(null, "resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes" + Modified: ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java =================================================================== --- ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,15 +18,26 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.*; -import com.arsdigita.cms.lifecycle.*; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import java.io.*; -import java.net.*; -import java.util.*; +import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentSectionCollection; +import com.arsdigita.cms.ContentType; +import com.arsdigita.cms.Template; +import com.arsdigita.cms.TemplateManager; +import com.arsdigita.cms.TemplateManagerFactory; +import com.arsdigita.cms.lifecycle.LifecycleDefinition; +import com.arsdigita.cms.lifecycle.LifecycleDefinitionCollection; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.runtime.Startup; +import com.arsdigita.util.Assert; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.Date; import org.apache.log4j.Logger; /** Modified: ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java =================================================================== --- ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java =================================================================== --- ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -44,7 +39,7 @@ } public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Organization.xsl" }; } Modified: ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java =================================================================== --- ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,10 +18,23 @@ */ package com.arsdigita.cms.contenttypes.ui; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.parameters.*; +import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.SaveCancelSection; +import com.arsdigita.bebop.form.FileUpload; +import com.arsdigita.bebop.form.FormErrorDisplay; +import com.arsdigita.bebop.form.Option; +import com.arsdigita.bebop.form.RadioGroup; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormSubmissionListener; +import com.arsdigita.bebop.event.FormValidationListener; +import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ImageAsset; @@ -29,8 +42,8 @@ import com.arsdigita.dispatcher.MultipartHttpServletRequest; -import java.io.*; -import java.sql.*; +import java.io.File; +import java.io.IOException; import com.arsdigita.cms.ImageAsset; import com.arsdigita.cms.contenttypes.Organization; @@ -48,7 +61,6 @@ import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.form.FormErrorDisplay; -import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; Modified: ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java =================================================================== --- ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java =================================================================== --- ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java =================================================================== --- ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -43,9 +38,9 @@ super("ccm-cms-types-siteproxy.pdl.mf", SiteProxy.BASE_DATA_OBJECT_TYPE); } - + public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xsl" }; } |
From: <ssk...@vh...> - 2005-09-02 14:02:28
|
Author: sskracic Date: 2005-09-02 15:53:42 +0200 (Fri, 02 Sep 2005) New Revision: 754 Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java Log: NFC: import trim. Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java =================================================================== --- ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java 2005-09-02 13:42:47 UTC (rev 753) +++ ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java 2005-09-02 13:53:42 UTC (rev 754) @@ -18,15 +18,11 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; import com.arsdigita.persistence.DataObject; - +import com.arsdigita.runtime.DomainInitEvent; import org.apache.log4j.Logger; /** |
Author: sskracic Date: 2005-09-02 15:42:47 +0200 (Fri, 02 Sep 2005) New Revision: 753 Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPLoginModule.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/UserLogin.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java ccm-cms-assets-notes/trunk/src/com/arsdigita/london/notes/NotesInitializer.java ccm-cms-assets-relatedlink/trunk/src/com/arsdigita/cms/contentassets/ui/RelatedLinkTableModelBuilder.java ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/Address.java ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/IsoCountry.java ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/Agenda.java ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertiesStep.java ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/Article.java ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertyForm.java ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/Event.java ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/util/EventResourceBundle.java ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/util/FAQResourceBundle.java ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/FileStorageItem.java ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemFileEdit.java ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemPropertiesStep.java ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItemInitializer.java ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/formbuilder/FormItemLoader.java ccm-cms-types-formitem/trunk/src/com/arsdigita/cms/ui/formbuilder/FormProperties.java ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/formbuilder/FormCopier.java ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/formbuilder/FormSectionItem.java ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/formbuilder/FormSectionItemLoader.java ccm-cms-types-formsectionitem/trunk/src/com/arsdigita/cms/ui/formbuilder/FormSectionProperties.java ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/GlossaryItemCreate.java ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/util/GlossaryResourceBundle.java ccm-cms-types-htmlform/trunk/src/com/arsdigita/cms/contenttypes/HTMLForm.java ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/ui/InlineSitePropertyForm.java ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/Job.java ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/ui/JobPropertiesStep.java ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/ui/JobPropertyForm.java ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNotice.java ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/ui/LegalNoticePropertiesStep.java ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/Minutes.java ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/ui/MinutesPropertiesStep.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItem.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/ui/MOTDComponent.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/MOTDItemCreate.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/MOTDItemFileEdit.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/util/MOTDResourceBundle.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ArticleSection.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticle.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleInitializer.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ui/mparticle/ArticleSectionPanel.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleCreate.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEdit.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/util/MultiPartArticleResourceBundle.java ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItem.java ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/ui/NewsItemPropertiesStep.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertiesStep.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationPropertyForm.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/OrganizationCreate.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/util/OrganizationResourceBundle.java ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressRelease.java ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/ui/PressReleasePropertiesStep.java ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/Service.java ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ui/ServicePropertiesStep.java ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyLoader.java ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/ui/SiteProxyPropertyForm.java ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/dispatcher/SiteProxyPanel.java ccm-formbuilder-pdf/trunk/src/com/arsdigita/formbuilder/pdf/PDFDocumentForm.java ccm-formbuilder-pdf/trunk/src/com/arsdigita/formbuilder/pdf/PDFListener.java ccm-forum/trunk/src/com/arsdigita/forum/Forum.java ccm-forum/trunk/src/com/arsdigita/forum/ForumConfig.java ccm-forum/trunk/src/com/arsdigita/forum/ForumContext.java ccm-forum/trunk/src/com/arsdigita/forum/Initializer.java ccm-forum/trunk/src/com/arsdigita/forum/Loader.java ccm-forum/trunk/src/com/arsdigita/forum/PopulateForum.java ccm-forum/trunk/src/com/arsdigita/forum/portlet/RecentPostingsPortlet.java ccm-forum/trunk/src/com/arsdigita/forum/ui/CategoryAddForm.java ccm-forum/trunk/src/com/arsdigita/forum/ui/CategoryView.java ccm-forum/trunk/src/com/arsdigita/forum/ui/EditPostForm.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumAlertsView.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumComponent.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ForumUserView.java ccm-forum/trunk/src/com/arsdigita/forum/ui/MessageView.java ccm-forum/trunk/src/com/arsdigita/forum/ui/MessageXMLFormatter.java ccm-forum/trunk/src/com/arsdigita/forum/ui/NewPostForm.java ccm-forum/trunk/src/com/arsdigita/forum/ui/PostForm.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ReplyToPostForm.java ccm-forum/trunk/src/com/arsdigita/forum/ui/Text.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadAlertsList.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadComponent.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadList.java ccm-forum/trunk/src/com/arsdigita/forum/ui/TopicList.java ccm-forum/trunk/src/com/arsdigita/forum/ui/TopicSelector.java ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/ModerationFormSection.java ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/NoticeboardFormSection.java ccm-forum/trunk/src/com/arsdigita/forum/ui/admin/RejectionForm.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/AplawsConfig.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/TermWidget.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZ.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZCategoryGenerator.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZConfig.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZItemAlias.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZItemGenerator.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZItemProvider.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZProvider.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/Loader.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasList.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlackList.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlockForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAliasList.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ProviderForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ProviderList.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/DublinCoreItem.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/DublinCoreEdit.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/DublinCoreForm.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/DublinCoreSummary.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/CategoryExportTool.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/CategoryExporter.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/ContentExporter.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/ItemExportTool.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/SingleImageProperty.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepDisplay.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepEdit.java ccm-ldn-importer/trunk/src/com/arsdigita/london/importer/ImportParser.java ccm-ldn-importer/trunk/src/com/arsdigita/london/importer/TagParser.java ccm-ldn-importer/trunk/src/com/arsdigita/london/importer/cms/AssetImportTool.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionDefinition.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DefaultNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/GlobalNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Initializer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Navigation.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationFileResolver.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Template.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/AbstractComponent.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/AbstractContainer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/ApplicationPath.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/BebopComponentAdapter.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/ContentList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/GreetingItem.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/ObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/RelatedItems.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/URLComponent.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryForm.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryFormAddContext.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryFormProcessListener.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Menu.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Path.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Siblings.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/TopLevel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/object/SimpleObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Initializer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Loader.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortal.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/StatefulPersistentPortalModelBuilder.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Workspace.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/portlet/RSSFeedPortletHelper.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/portlet/WorkspaceDirectoryChannel.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/DefaultWorkspaceSelectionModel.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/LayoutForm.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PersistentPortal.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortalEditForm.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortalEditModelBuilder.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortalHelper.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortalList.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortalViewModelBuilder.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortletConfigFormSection.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/SimplePortlet.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/WorkspaceComponent.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/AdminPane.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/ApplicationDetails.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/ApplicationList.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/ApplicationPane.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/CategoryTable.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/WorkspaceConfigFormSection.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/ApplicationDirectoryPortletRenderer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletEditor.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletRenderer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletEditor.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletRenderer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditor.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditorForm.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletRenderer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/portlet/TimeOfDayPortletRenderer.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Loader.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSFileResolver.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSService.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/category/CategoryChannel.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/installer/Initializer.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/ui/ChannelGenerator.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/ui/ChannelIndex.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/ui/FeedGenerator.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/ui/admin/FeedsPanel.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/ui/admin/FeedsTable.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/Initializer.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/Loader.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/RemoteQueryEngine.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/SOAPHandler.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchResult.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/Initializer.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/SpideredContent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/SpideredContentURLFinder.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/HostFilterWidget.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/RemoteSearchPane.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SearchComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SponsoredLinksComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/admin/ServerForm.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/admin/ServersPanel.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/admin/ServersTable.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/admin/SponsoredLinkForm.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/admin/SponsoredLinksPanel.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/admin/SponsoredLinksTable.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutUtil.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ui/AdminPanel.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ui/ShortcutForm.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ui/ShortcutsTable.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/Subsite.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/SubsiteContext.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Importer.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/SetRoot.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/Parser.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/TermItemBuilder.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/FlatCategoryPicker.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainDetails.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainForm.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainPanel.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/NarrowerTermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermDetails.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermFilteredListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermForm.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermPanel.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Initializer.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Theme.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeCollection.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeConfig.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeConstants.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeFile.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeFileCollection.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeTransactionListener.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeContainer.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeFilesList.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeForm.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeListModelBuilder.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeProperties.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeValidationPanel.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/listeners/ApproveThemeActionListener.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/listeners/LoggingErrorListener.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/ThemeDevelopmentFileManager.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/ThemeFileManager.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/ThemeFileUtil.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/TransformerExceptionContainer.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Categorization.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/DomainObjectCopier.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/cmd/SiteMapList.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/ACSObjectInvariantCheck.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantFactory.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantFactoryImpl.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantHandler.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantImpl.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/devsupport/QueryLogger.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractCategoryPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractDomainObjectComponent.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractDomainObjectDetails.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractDomainObjectList.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/ApplicationCategoryPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/DataCollectionListModel.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/ObjectCategoryPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/UserPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/parameters/URLParameter.java ccm-ldn-xmlfeed/trunk/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java ccm-ldn-xmlfeed/trunk/src/com/arsdigita/cms/contenttypes/xmlfeed/XMLFeed.java ccm-ldn-xmlfeed/trunk/src/com/arsdigita/cms/contenttypes/xmlfeed/listener/RetrieveListener.java ccm-ldn-xmlfeed/trunk/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XSLFileProperties.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Poll.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ResponseCollection.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/SimpleSurvey.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Survey.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/SurveyCollection.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/IndexPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/ResultsPane.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyTable.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/ViewPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AnswerValuesPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/CSVFilePanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/FormSelectionModel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/IndexPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/OneQuestionPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/OneResponsePanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/ReportPanel.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/widgets/CheckboxWidgetForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/widgets/DateWidgetForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/widgets/EssayWidgetForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/widgets/OneLineWidgetForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/widgets/RadioWidgetForm.java ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java Log: NFC: dropping unused imports across all of Aplaws+ code. Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java 2005-09-02 13:42:47 UTC (rev 753) @@ -19,7 +19,6 @@ package com.arsdigita.auth.http; import com.arsdigita.web.Application; -import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.DataObject; import com.arsdigita.domain.DataObjectNotFoundException; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java 2005-09-02 13:42:47 UTC (rev 753) @@ -21,7 +21,6 @@ import javax.servlet.*; import javax.servlet.http.*; import java.security.*; -import java.util.HashMap; import javax.crypto.*; import sun.misc.BASE64Encoder; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPLoginModule.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPLoginModule.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPLoginModule.java 2005-09-02 13:42:47 UTC (rev 753) @@ -16,56 +16,39 @@ package com.arsdigita.auth.http; -import com.arsdigita.auth.http.UserLogin; - import com.arsdigita.db.Sequences; import com.arsdigita.kernel.KernelHelper; -import com.arsdigita.kernel.User; -import com.arsdigita.kernel.security.UserLoginModule; -import com.arsdigita.kernel.security.PasswordLoginModule; -import com.arsdigita.kernel.security.MappingLoginModule; import com.arsdigita.kernel.security.HTTPRequestCallback; import com.arsdigita.kernel.security.HTTPResponseCallback; +import com.arsdigita.kernel.security.MappingLoginModule; +import com.arsdigita.kernel.security.PasswordLoginModule; +import com.arsdigita.kernel.security.UserLoginModule; import com.arsdigita.kernel.security.Util; - -import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.DataOperation; +import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.util.ResourceManager; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.RedirectSignal; -import com.arsdigita.web.Web; -import com.arsdigita.web.URL; - -import java.util.Map; -import java.util.Iterator; -import java.util.Enumeration; -import java.util.Date; -import java.io.IOException; -import java.io.FileNotFoundException; -import java.io.FileInputStream; -import java.net.UnknownHostException; -import java.net.URLEncoder; +import java.math.BigDecimal; import java.net.InetAddress; +import java.net.URLEncoder; +import java.net.UnknownHostException; +import java.security.GeneralSecurityException; +import java.security.PublicKey; +import java.util.Date; +import java.util.Enumeration; +import java.util.Map; import javax.crypto.Cipher; +import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; -import java.security.PublicKey; -import java.security.KeyStore; -import java.security.GeneralSecurityException; +import javax.security.auth.login.LoginException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import javax.security.auth.Subject; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; - +import org.apache.log4j.Logger; import sun.misc.BASE64Decoder; -import org.apache.log4j.Logger; - /** * <p> * Attempt to authenticate a user against an IIS server for seamless login Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -32,7 +32,6 @@ import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.CompoundInitializer; -import com.arsdigita.runtime.LegacyInitEvent; import com.arsdigita.runtime.DomainInitEvent; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/UserLogin.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/UserLogin.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/UserLogin.java 2005-09-02 13:42:47 UTC (rev 753) @@ -15,8 +15,6 @@ package com.arsdigita.auth.http; -import com.arsdigita.domain.DomainObject; -import com.arsdigita.domain.DomainObjectInstantiator; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.User; import com.arsdigita.kernel.ACSObject; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java 2005-09-02 13:42:47 UTC (rev 753) @@ -34,7 +34,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.kernel.*; import com.arsdigita.persistence.*; -import com.arsdigita.util.UncheckedWrapperException; import java.math.BigDecimal; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java 2005-09-02 13:42:47 UTC (rev 753) @@ -34,7 +34,6 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; import java.io.*; -import java.sql.SQLException; import java.util.*; import org.apache.log4j.Logger; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java 2005-09-02 13:42:47 UTC (rev 753) @@ -17,9 +17,6 @@ import com.arsdigita.auth.http.*; -import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.metadata.DynamicObjectType; -import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.*; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.kernel.User; @@ -28,7 +25,6 @@ import com.arsdigita.util.Assert; import java.io.*; -import java.sql.SQLException; import java.util.*; import org.apache.log4j.Logger; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java 2005-09-02 13:42:47 UTC (rev 753) @@ -21,9 +21,7 @@ import com.arsdigita.bebop.event.*; import com.arsdigita.bebop.form.*; import com.arsdigita.bebop.parameters.*; -import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.kernel.*; -import com.arsdigita.util.UncheckedWrapperException; import javax.mail.internet.InternetAddress; Modified: ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java =================================================================== --- ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -22,7 +22,6 @@ import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.kernel.URLService; import com.arsdigita.runtime.LegacyInitEvent; -import com.arsdigita.search.MetadataProviderRegistry; /** * Initializer Modified: ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java =================================================================== --- ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachmentURLFinder.java 2005-09-02 13:42:47 UTC (rev 753) @@ -26,7 +26,6 @@ import com.arsdigita.kernel.URLFinder; import com.arsdigita.kernel.URLService; import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; Modified: ccm-cms-assets-notes/trunk/src/com/arsdigita/london/notes/NotesInitializer.java =================================================================== --- ccm-cms-assets-notes/trunk/src/com/arsdigita/london/notes/NotesInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-assets-notes/trunk/src/com/arsdigita/london/notes/NotesInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -17,7 +17,6 @@ package com.arsdigita.london.notes; import com.arsdigita.cms.contenttypes.ContentAssetInitializer; -import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.dispatcher.SimpleXMLGenerator; Modified: ccm-cms-assets-relatedlink/trunk/src/com/arsdigita/cms/contentassets/ui/RelatedLinkTableModelBuilder.java =================================================================== --- ccm-cms-assets-relatedlink/trunk/src/com/arsdigita/cms/contentassets/ui/RelatedLinkTableModelBuilder.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-assets-relatedlink/trunk/src/com/arsdigita/cms/contentassets/ui/RelatedLinkTableModelBuilder.java 2005-09-02 13:42:47 UTC (rev 753) @@ -15,18 +15,12 @@ package com.arsdigita.cms.contentassets.ui; import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.Table; -import com.arsdigita.bebop.table.TableModel; -import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contentassets.RelatedLink; import com.arsdigita.cms.contenttypes.ui.LinkTableModelBuilder; -import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.DataObject; import com.arsdigita.util.Assert; -import com.arsdigita.util.LockableImpl; import org.apache.log4j.Logger; /** Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/Address.java =================================================================== --- ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/Address.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/Address.java 2005-09-02 13:42:47 UTC (rev 753) @@ -18,14 +18,12 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentPage; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.Assert; import java.math.BigDecimal; Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java =================================================================== --- ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/AddressInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -18,7 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.ContentType; import com.arsdigita.db.*; import com.arsdigita.persistence.pdl.*; Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/IsoCountry.java =================================================================== --- ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/IsoCountry.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/IsoCountry.java 2005-09-02 13:42:47 UTC (rev 753) @@ -21,7 +21,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainCollection; -import com.arsdigita.kernel.ACSObject; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java =================================================================== --- ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java 2005-09-02 13:42:47 UTC (rev 753) @@ -22,7 +22,6 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.cms.contenttypes.util.AddressGlobalizationUtil; import com.arsdigita.cms.contenttypes.Address; -import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.domain.DomainObject; Modified: ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java =================================================================== --- ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-address/trunk/src/com/arsdigita/cms/contenttypes/util/AddressResourceBundle.java 2005-09-02 13:42:47 UTC (rev 753) @@ -19,11 +19,6 @@ package com.arsdigita.cms.contenttypes.util; import java.util.PropertyResourceBundle; -import java.util.ResourceBundle; -import java.util.Enumeration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.cms.CMSGlobalized; Modified: ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/Agenda.java =================================================================== --- ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/Agenda.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/Agenda.java 2005-09-02 13:42:47 UTC (rev 753) @@ -22,11 +22,9 @@ import com.arsdigita.cms.ContentType; import com.arsdigita.cms.TextAsset; import com.arsdigita.cms.TextPage; -import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.Assert; import org.apache.log4j.Logger; Modified: ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java =================================================================== --- ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -18,15 +18,12 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.search.ContentPageMetadataProvider; import com.arsdigita.db.*; import com.arsdigita.domain.xml.*; import com.arsdigita.persistence.pdl.*; import com.arsdigita.runtime.*; import com.arsdigita.xml.*; -import com.arsdigita.search.MetadataProviderRegistry; import org.apache.log4j.Logger; Modified: ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertiesStep.java =================================================================== --- ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertiesStep.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/ui/AgendaPropertiesStep.java 2005-09-02 13:42:47 UTC (rev 753) @@ -21,7 +21,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.PageState; -import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ItemSelectionModel; Modified: ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/Article.java =================================================================== --- ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/Article.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/Article.java 2005-09-02 13:42:47 UTC (rev 753) @@ -23,7 +23,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.Assert; import java.math.BigDecimal; Modified: ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java =================================================================== --- ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -18,15 +18,10 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.ContentType; import com.arsdigita.db.*; import com.arsdigita.persistence.pdl.*; import com.arsdigita.runtime.*; -import com.arsdigita.domain.DomainObject; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.domain.DomainObjectInstantiator; -import com.arsdigita.persistence.DataObject; import org.apache.log4j.Logger; Modified: ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java =================================================================== --- ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ui/ArticlePropertiesStep.java 2005-09-02 13:42:47 UTC (rev 753) @@ -20,7 +20,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.PageState; -import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ItemSelectionModel; @@ -28,7 +27,6 @@ import com.arsdigita.domain.DomainObject; import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; -import com.arsdigita.cms.ui.authoring.AuthoringStepComponent; import com.arsdigita.cms.ui.authoring.BasicPageForm; import com.arsdigita.cms.ui.authoring.SimpleEditStep; import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; Modified: ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java =================================================================== --- ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -18,15 +18,10 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.ContentType; import com.arsdigita.db.*; import com.arsdigita.persistence.pdl.*; import com.arsdigita.runtime.*; -import com.arsdigita.domain.DomainObject; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.domain.DomainObjectInstantiator; -import com.arsdigita.persistence.DataObject; import org.apache.log4j.Logger; Modified: ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertyForm.java =================================================================== --- ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertyForm.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/ui/BookmarkPropertyForm.java 2005-09-02 13:42:47 UTC (rev 753) @@ -26,7 +26,6 @@ import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.form.TextField; -import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; Modified: ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/Event.java =================================================================== --- ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/Event.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/Event.java 2005-09-02 13:42:47 UTC (rev 753) @@ -21,13 +21,11 @@ import com.arsdigita.cms.ContentType; import com.arsdigita.cms.TextPage; -import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.Assert; import java.math.BigDecimal; Modified: ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java =================================================================== --- ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -18,7 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.ContentType; import com.arsdigita.db.*; import com.arsdigita.domain.xml.*; Modified: ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java =================================================================== --- ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/ui/EventPropertiesStep.java 2005-09-02 13:42:47 UTC (rev 753) @@ -21,7 +21,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.PageState; -import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ItemSelectionModel; Modified: ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/util/EventResourceBundle.java =================================================================== --- ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/util/EventResourceBundle.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/util/EventResourceBundle.java 2005-09-02 13:42:47 UTC (rev 753) @@ -19,11 +19,6 @@ package com.arsdigita.cms.contenttypes.util; import java.util.PropertyResourceBundle; -import java.util.ResourceBundle; -import java.util.Enumeration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.cms.CMSGlobalized; Modified: ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java =================================================================== --- ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java 2005-09-02 13:42:47 UTC (rev 753) @@ -18,15 +18,10 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.ContentType; import com.arsdigita.db.*; import com.arsdigita.persistence.pdl.*; import com.arsdigita.runtime.*; -import com.arsdigita.domain.DomainObject; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.domain.DomainObjectInstantiator; -import com.arsdigita.persistence.DataObject; import org.apache.log4j.Logger; Modified: ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java =================================================================== --- ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FAQItemCreate.java 2005-09-02 13:42:47 UTC (rev 753) @@ -29,15 +29,11 @@ import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.parameters.NotNullValidationListener; -import com.arsdigita.bebop.parameters.StringLengthValidationListener; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.PageState; -import com.arsdigita.kernel.KernelHelper; import com.arsdigita.cms.contenttypes.util.FAQGlobalizationUtil; -import java.math.BigDecimal; -import java.lang.Exception; /* * A page that will create a new FAQItem. Modified: ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/util/FAQResourceBundle.java =================================================================== --- ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/util/FAQResourceBundle.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/util/FAQResourceBundle.java 2005-09-02 13:42:47 UTC (rev 753) @@ -19,11 +19,6 @@ package com.arsdigita.cms.contenttypes.util; import java.util.PropertyResourceBundle; -import java.util.ResourceBundle; -import java.util.Enumeration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; import com.arsdigita.globalization.ChainedResourceBundle; import com.arsdigita.cms.CMSGlobalized; Modified: ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/FileStorageItem.java =================================================================== --- ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/FileStorageItem.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/FileStorageItem.java 2005-09-02 13:42:47 UTC (rev 753) @@ -22,8 +22,6 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.DataObject; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.ItemCopier; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentPage; import com.arsdigita.util.Assert; Modified: ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemFileEdit.java =================================================================== --- ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemFileEdit.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemFileEdit.java 2005-09-02 13:42:47 UTC (rev 753) @@ -26,11 +26,9 @@ import com.arsdigita.bebop.event.PrintEvent; import com.arsdigita.bebop.event.PrintListener; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSubmissionListener; -import com.arsdigita.bebop.event.FormValidationListener; import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.mimetypes.MimeType; import com.arsdigita.cms.FileAsset; @@ -44,7 +42,6 @@ import com.arsdigita.cms.util.GlobalizationUtil; import java.io.IOException; -import java.util.TooManyListenersException; import java.lang.RuntimeException; /* Modified: ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemPropertiesStep.java =================================================================== --- ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemPropertiesStep.java 2005-09-02 13:26:17 UTC (rev 752) +++ ccm-cms-types-filestorageitem/trunk/src/com/arsdigita/cms/contenttypes/ui/authoring/FileStorageItemPropertiesStep.java 2005-09-02 13:42:47 UTC (rev 753) @@ -21,18 +21,13 @@ import com.arsdigita.cms.contenttypes.FileStorageItem; import com.arsdigita.cms.contenttypes.ui.FileStorageItemPropertyForm; import com.arsdigita.bebop.Component; -import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.PageState; -import com.arsdigita.domain.DomainObject; import com.arsdigita.cms.ui.authoring.BasicPageForm; -import com.arsd... [truncated message content] |
From: <ssk...@vh...> - 2005-09-02 13:36:33
|
Author: sskracic Date: 2005-09-02 15:26:17 +0200 (Fri, 02 Sep 2005) New Revision: 752 Modified: ccm-cms/trunk/src/com/arsdigita/cms/CategoryTemplateCollection.java ccm-cms/trunk/src/com/arsdigita/cms/ContentSection.java ccm-cms/trunk/src/com/arsdigita/cms/DomainCopier.java ccm-cms/trunk/src/com/arsdigita/cms/Folder.java ccm-cms/trunk/src/com/arsdigita/cms/Initializer.java ccm-cms/trunk/src/com/arsdigita/cms/ItemCollection.java ccm-cms/trunk/src/com/arsdigita/cms/ItemCopier.java ccm-cms/trunk/src/com/arsdigita/cms/ItemTemplateMapping.java ccm-cms/trunk/src/com/arsdigita/cms/Loader.java ccm-cms/trunk/src/com/arsdigita/cms/ObjectCopier.java ccm-cms/trunk/src/com/arsdigita/cms/ReusableImageAsset.java ccm-cms/trunk/src/com/arsdigita/cms/RickshawPublishAPIUpgrade.java ccm-cms/trunk/src/com/arsdigita/cms/Template.java ccm-cms/trunk/src/com/arsdigita/cms/TroikaRickshawUpgrade.java ccm-cms/trunk/src/com/arsdigita/cms/UserHomeFolderMap.java ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/ui/LinkTableModelBuilder.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/AssetURLFinder.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/BaseAsset.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentItemXSLServlet.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentTypeXSLServlet.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/DefaultTemplateResolver.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/StreamImage.java ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/TemplateXSLServlet.java ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentCenterSetup.java ccm-cms/trunk/src/com/arsdigita/cms/installer/Initializer.java ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/Scheduler.java ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/SchedulerTask.java ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/DestinationStub.java ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/Initializer.java ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedFile.java ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/QueueManager.java ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java ccm-cms/trunk/src/com/arsdigita/cms/search/IntermediaQueryEngine.java ccm-cms/trunk/src/com/arsdigita/cms/search/VersionFilterSpecification.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java ccm-cms/trunk/src/com/arsdigita/cms/ui/BrowsePane.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentItemPage.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentSectionPage.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ControlButton.java ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ImageChooser.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearch.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSection.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchWidget.java ccm-cms/trunk/src/com/arsdigita/cms/ui/PartyAddForm.java ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java ccm-cms/trunk/src/com/arsdigita/cms/ui/UserAddForm.java ccm-cms/trunk/src/com/arsdigita/cms/ui/WorkspacePage.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/ArticleImage.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/CategoryWidget.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/CreationSelector.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/ItemCategoryForm.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/ItemCategoryStep.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/ItemCategorySummary.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/TextAssetBodyLabelCellRenderer.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoring/TextAssetBodyPropertySheet.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoringkit/AddStep.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoringkit/EditKit.java ccm-cms/trunk/src/com/arsdigita/cms/ui/authoringkit/KitPanel.java ccm-cms/trunk/src/com/arsdigita/cms/ui/category/AddUseContextForm.java ccm-cms/trunk/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java ccm-cms/trunk/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java ccm-cms/trunk/src/com/arsdigita/cms/ui/category/PurposeForm.java ccm-cms/trunk/src/com/arsdigita/cms/ui/category/PurposesList.java ccm-cms/trunk/src/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderManipulator.java ccm-cms/trunk/src/com/arsdigita/cms/ui/folder/FolderRequestLocal.java ccm-cms/trunk/src/com/arsdigita/cms/ui/item/Summary.java ccm-cms/trunk/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletEditor.java ccm-cms/trunk/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java ccm-cms/trunk/src/com/arsdigita/cms/ui/search/ItemQueryComponent.java ccm-cms/trunk/src/com/arsdigita/cms/ui/templates/ItemTemplates.java ccm-cms/trunk/src/com/arsdigita/cms/ui/templates/TemplateBody.java ccm-cms/trunk/src/com/arsdigita/cms/ui/type/ContentTypeItemPane.java ccm-cms/trunk/src/com/arsdigita/cms/ui/user/BundleList.java ccm-cms/trunk/src/com/arsdigita/cms/ui/user/FolderList.java ccm-cms/trunk/src/com/arsdigita/cms/ui/workflow/ItemWorkflowItemPane.java ccm-cms/trunk/src/com/arsdigita/cms/workflow/CMSTask.java Log: NFC: import trim in ccm-cms. Modified: ccm-cms/trunk/src/com/arsdigita/cms/CategoryTemplateCollection.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/CategoryTemplateCollection.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/CategoryTemplateCollection.java 2005-09-02 13:26:17 UTC (rev 752) @@ -18,7 +18,6 @@ */ package com.arsdigita.cms; -import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObject; import com.arsdigita.persistence.DataCollection; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ContentSection.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ContentSection.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ContentSection.java 2005-09-02 13:26:17 UTC (rev 752) @@ -34,8 +34,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.globalization.Locale; import com.arsdigita.kernel.Group; -import com.arsdigita.kernel.KernelHelper; -import com.arsdigita.kernel.Party; import com.arsdigita.kernel.SiteNode; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PermissionService; Modified: ccm-cms/trunk/src/com/arsdigita/cms/DomainCopier.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/DomainCopier.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/DomainCopier.java 2005-09-02 13:26:17 UTC (rev 752) @@ -31,11 +31,8 @@ import com.arsdigita.util.Assert; import com.arsdigita.util.Tracer; import com.arsdigita.util.Classes; -import com.arsdigita.util.UncheckedWrapperException; import org.apache.log4j.Logger; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; Modified: ccm-cms/trunk/src/com/arsdigita/cms/Folder.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/Folder.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/Folder.java 2005-09-02 13:26:17 UTC (rev 752) @@ -25,7 +25,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainCollectionIterator; -import com.arsdigita.domain.DomainServiceInterfaceExposer; import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.User; import com.arsdigita.kernel.permissions.PermissionService; @@ -44,7 +43,6 @@ import java.math.BigDecimal; import java.util.Date; -import java.util.Collection; import java.util.Iterator; /** Modified: ccm-cms/trunk/src/com/arsdigita/cms/Initializer.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/Initializer.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/Initializer.java 2005-09-02 13:26:17 UTC (rev 752) @@ -61,7 +61,6 @@ import com.arsdigita.search.IndexerType; import com.arsdigita.search.MetadataProviderRegistry; import com.arsdigita.search.QueryEngineRegistry; -import com.arsdigita.search.Search; import com.arsdigita.search.filters.PermissionFilterType; import com.arsdigita.search.filters.CategoryFilterType; import com.arsdigita.util.UncheckedWrapperException; @@ -69,7 +68,6 @@ import com.arsdigita.workflow.simple.WorkflowTemplate; import com.arsdigita.search.filters.ContentSectionFilterType; import com.arsdigita.search.filters.ObjectTypeFilterType; -import com.arsdigita.search.lucene.ContentSectionFilter; import com.arsdigita.search.lucene.BaseQueryEngine; import com.arsdigita.xml.XML; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ItemCollection.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ItemCollection.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ItemCollection.java 2005-09-02 13:26:17 UTC (rev 752) @@ -20,7 +20,6 @@ import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObject; -import com.arsdigita.persistence.DataObject; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.ACSObject; import com.arsdigita.persistence.DataCollection; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ItemCopier.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ItemCopier.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ItemCopier.java 2005-09-02 13:26:17 UTC (rev 752) @@ -19,7 +19,6 @@ package com.arsdigita.cms; import com.arsdigita.domain.DomainObject; -import com.arsdigita.kernel.ACSObject; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.metadata.Property; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ItemTemplateMapping.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ItemTemplateMapping.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ItemTemplateMapping.java 2005-09-02 13:26:17 UTC (rev 752) @@ -29,7 +29,6 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.mimetypes.MimeType; import com.arsdigita.util.Assert; -import java.util.Arrays; import java.math.BigDecimal; Modified: ccm-cms/trunk/src/com/arsdigita/cms/Loader.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/Loader.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/Loader.java 2005-09-02 13:26:17 UTC (rev 752) @@ -18,18 +18,8 @@ */ package com.arsdigita.cms; -import com.arsdigita.db.DbHelper; import com.arsdigita.loader.PackageLoader; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.Session; -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.TransactionContext; -import com.arsdigita.runtime.RuntimeConfig; -import com.arsdigita.runtime.Script; import com.arsdigita.runtime.ScriptContext; -import com.arsdigita.runtime.Startup; -import com.arsdigita.util.jdbc.Connections; -import java.sql.Connection; import org.apache.log4j.Logger; /** Modified: ccm-cms/trunk/src/com/arsdigita/cms/ObjectCopier.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ObjectCopier.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ObjectCopier.java 2005-09-02 13:26:17 UTC (rev 752) @@ -19,8 +19,6 @@ package com.arsdigita.cms; import com.arsdigita.domain.DomainObject; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.OID; import com.arsdigita.persistence.metadata.Property; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ReusableImageAsset.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ReusableImageAsset.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ReusableImageAsset.java 2005-09-02 13:26:17 UTC (rev 752) @@ -22,15 +22,12 @@ import com.arsdigita.kernel.ACSObject; import com.arsdigita.mimetypes.ImageMimeType; import com.arsdigita.mimetypes.MimeType; -import com.arsdigita.mimetypes.image.ImageSizer; -import com.arsdigita.mimetypes.image.ImageSizerFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.Filter; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; import com.arsdigita.versioning.VersionedACSObject; -import java.awt.Dimension; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; Modified: ccm-cms/trunk/src/com/arsdigita/cms/RickshawPublishAPIUpgrade.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/RickshawPublishAPIUpgrade.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/RickshawPublishAPIUpgrade.java 2005-09-02 13:26:17 UTC (rev 752) @@ -33,13 +33,11 @@ import com.arsdigita.persistence.CompoundFilter; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.Filter; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TransactionContext; import com.arsdigita.runtime.Startup; -import com.arsdigita.util.UncheckedWrapperException; import com.redhat.persistence.engine.rdbms.RDBMSException; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/Template.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/Template.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/Template.java 2005-09-02 13:26:17 UTC (rev 752) @@ -26,10 +26,8 @@ import org.apache.log4j.Logger; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import java.util.ListIterator; /** * This class represents a template. Modified: ccm-cms/trunk/src/com/arsdigita/cms/TroikaRickshawUpgrade.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/TroikaRickshawUpgrade.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/TroikaRickshawUpgrade.java 2005-09-02 13:26:17 UTC (rev 752) @@ -18,15 +18,14 @@ */ package com.arsdigita.cms; -import com.arsdigita.initializer.Initializer; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; -import com.arsdigita.runtime.*; +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.persistence.metadata.ObjectType; +import com.arsdigita.runtime.Startup; import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.apache.log4j.Logger; /** Modified: ccm-cms/trunk/src/com/arsdigita/cms/UserHomeFolderMap.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/UserHomeFolderMap.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/UserHomeFolderMap.java 2005-09-02 13:26:17 UTC (rev 752) @@ -24,15 +24,12 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; -import java.sql.SQLException; import org.apache.log4j.Logger; -import org.apache.log4j.Priority; public class UserHomeFolderMap extends ACSObject { Modified: ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java 2005-09-02 13:26:17 UTC (rev 752) @@ -19,7 +19,6 @@ package com.arsdigita.cms.contenttypes; import com.arsdigita.cms.ContentSection; -import com.arsdigita.cms.ContentSectionCollection; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentTypeLifecycleDefinition; import com.arsdigita.cms.ContentTypeWorkflowTemplate; @@ -29,7 +28,6 @@ import com.arsdigita.cms.installer.xml.XMLContentTypeHandler; import com.arsdigita.cms.lifecycle.LifecycleDefinition; import com.arsdigita.cms.lifecycle.LifecycleDefinitionCollection; -import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; @@ -39,7 +37,6 @@ import com.arsdigita.runtime.ScriptContext; import com.arsdigita.util.Assert; import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.parameter.Parameter; import com.arsdigita.workflow.simple.TaskCollection; import com.arsdigita.workflow.simple.WorkflowTemplate; import com.arsdigita.xml.XML; Modified: ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/ui/LinkTableModelBuilder.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/ui/LinkTableModelBuilder.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/contenttypes/ui/LinkTableModelBuilder.java 2005-09-02 13:26:17 UTC (rev 752) @@ -22,13 +22,10 @@ import com.arsdigita.bebop.Table; import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableModelBuilder; -import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Link; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; -import com.arsdigita.util.Assert; import com.arsdigita.util.LockableImpl; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/AssetURLFinder.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/AssetURLFinder.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/AssetURLFinder.java 2005-09-02 13:26:17 UTC (rev 752) @@ -17,7 +17,6 @@ package com.arsdigita.cms.dispatcher; import com.arsdigita.cms.Asset; -import com.arsdigita.cms.ContentItem; import com.arsdigita.kernel.NoValidURLException; import com.arsdigita.kernel.URLFinder; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/BaseAsset.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/BaseAsset.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/BaseAsset.java 2005-09-02 13:26:17 UTC (rev 752) @@ -19,7 +19,6 @@ package com.arsdigita.cms.dispatcher; import com.arsdigita.bebop.parameters.BigDecimalParameter; -import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.cms.BinaryAsset; import com.arsdigita.cms.Asset; import com.arsdigita.dispatcher.DispatcherHelper; @@ -28,7 +27,6 @@ import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.mimetypes.MimeType; import com.arsdigita.persistence.OID; -import com.arsdigita.util.Assert; import com.arsdigita.toolbox.ui.OIDParameter; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java 2005-09-02 13:26:17 UTC (rev 752) @@ -34,8 +34,6 @@ import com.arsdigita.kernel.KernelHelper; import com.arsdigita.kernel.SiteNode; import com.arsdigita.kernel.User; -import com.arsdigita.persistence.Session; -import com.arsdigita.persistence.SessionManager; import com.arsdigita.web.LoginSignal; import com.arsdigita.web.URL; import java.io.File; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentItemXSLServlet.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentItemXSLServlet.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentItemXSLServlet.java 2005-09-02 13:26:17 UTC (rev 752) @@ -18,9 +18,7 @@ */ package com.arsdigita.cms.dispatcher; -import com.arsdigita.cms.ItemTemplateMapping; -import com.arsdigita.mimetypes.MimeType; import com.arsdigita.util.IO; import com.arsdigita.web.BaseServlet; import com.arsdigita.templating.Templating; @@ -30,7 +28,6 @@ import java.net.URL; import java.net.MalformedURLException; import javax.servlet.ServletException; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentTypeXSLServlet.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentTypeXSLServlet.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ContentTypeXSLServlet.java 2005-09-02 13:26:17 UTC (rev 752) @@ -20,14 +20,11 @@ import com.arsdigita.cms.ContentType; -import com.arsdigita.mimetypes.MimeType; import com.arsdigita.util.IO; -import com.arsdigita.util.StringUtils; import com.arsdigita.web.BaseServlet; import com.arsdigita.templating.Templating; import javax.servlet.ServletException; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/DefaultTemplateResolver.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/DefaultTemplateResolver.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/DefaultTemplateResolver.java 2005-09-02 13:26:17 UTC (rev 752) @@ -25,7 +25,6 @@ import com.arsdigita.cms.Template; import com.arsdigita.cms.TemplateManager; import com.arsdigita.cms.TemplateManagerFactory; -import com.arsdigita.cms.DefaultTemplateManager; import com.arsdigita.mimetypes.MimeType; import com.arsdigita.util.Assert; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/ItemTemplatePatternGenerator.java 2005-09-02 13:26:17 UTC (rev 752) @@ -36,8 +36,6 @@ import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.ArrayList; /** * This looks to see if there is a given item and if there is it returns Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java 2005-09-02 13:26:17 UTC (rev 752) @@ -37,10 +37,8 @@ import java.math.BigDecimal; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -import java.util.Locale; import java.util.StringTokenizer; /** Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/StreamImage.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/StreamImage.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/StreamImage.java 2005-09-02 13:26:17 UTC (rev 752) @@ -28,10 +28,7 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.SessionManager; import com.arsdigita.toolbox.ui.OIDParameter; import com.arsdigita.versioning.Transaction; Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/TemplateXSLServlet.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/TemplateXSLServlet.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/TemplateXSLServlet.java 2005-09-02 13:26:17 UTC (rev 752) @@ -29,7 +29,6 @@ import javax.servlet.ServletException; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -38,7 +37,6 @@ import java.io.UnsupportedEncodingException; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.Collections; Modified: ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentCenterSetup.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentCenterSetup.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentCenterSetup.java 2005-09-02 13:26:17 UTC (rev 752) @@ -18,7 +18,6 @@ */ package com.arsdigita.cms.installer; -import com.arsdigita.cms.ContentSection; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.initializer.InitializationException; import com.arsdigita.kernel.PackageInstance; Modified: ccm-cms/trunk/src/com/arsdigita/cms/installer/Initializer.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/installer/Initializer.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/installer/Initializer.java 2005-09-02 13:26:17 UTC (rev 752) @@ -28,8 +28,6 @@ import org.apache.log4j.Logger; -import java.util.Collections; -import java.util.List; /** Modified: ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java 2005-09-02 13:26:17 UTC (rev 752) @@ -20,14 +20,9 @@ import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.ContentPage; -import com.arsdigita.cms.ContentSection; -import com.arsdigita.cms.ui.ContentItemPage; -import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.OID; import com.arsdigita.util.Assert; -import com.arsdigita.web.URL; import org.apache.log4j.Logger; /** Modified: ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/Scheduler.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/Scheduler.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/Scheduler.java 2005-09-02 13:26:17 UTC (rev 752) @@ -24,16 +24,11 @@ import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.persistence.DataQuery; -import com.arsdigita.persistence.DedicatedConnectionSource; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TransactionContext; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.jdbc.Connections; import java.math.BigDecimal; -import java.sql.Connection; import java.util.Date; import java.util.Iterator; import java.util.LinkedList; Modified: ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/SchedulerTask.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/SchedulerTask.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/lifecycle/SchedulerTask.java 2005-09-02 13:26:17 UTC (rev 752) @@ -22,7 +22,6 @@ import java.util.TimerTask; -import com.arsdigita.util.UncheckedWrapperException; /** Modified: ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/DestinationStub.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/DestinationStub.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/DestinationStub.java 2005-09-02 13:26:17 UTC (rev 752) @@ -18,8 +18,6 @@ */ package com.arsdigita.cms.publishToFile; -import com.arsdigita.web.URL; -import com.arsdigita.util.ResourceManager; import java.io.File; Modified: ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/Initializer.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/Initializer.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/Initializer.java 2005-09-02 13:26:17 UTC (rev 752) @@ -37,7 +37,6 @@ import org.apache.log4j.Logger; -import com.arsdigita.web.URL; import java.io.File; Modified: ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedFile.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedFile.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedFile.java 2005-09-02 13:26:17 UTC (rev 752) @@ -19,7 +19,6 @@ package com.arsdigita.cms.publishToFile; import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.Template; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; @@ -30,7 +29,6 @@ import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; -import com.arsdigita.util.ResourceManager; import com.arsdigita.web.Host; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/QueueManager.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/QueueManager.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/QueueManager.java 2005-09-02 13:26:17 UTC (rev 752) @@ -23,7 +23,6 @@ import com.arsdigita.cms.Folder; import com.arsdigita.kernel.ACSObject; import com.arsdigita.domain.DomainCollection; -import com.arsdigita.persistence.OID; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.DataQuery; Modified: ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java 2005-09-02 13:26:17 UTC (rev 752) @@ -21,8 +21,6 @@ import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentSection; import com.arsdigita.domain.DomainObject; -import com.arsdigita.search.ContentProvider; -import com.arsdigita.search.ContentType; import com.arsdigita.util.StringUtils; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/search/IntermediaQueryEngine.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/search/IntermediaQueryEngine.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/search/IntermediaQueryEngine.java 2005-09-02 13:26:17 UTC (rev 752) @@ -41,7 +41,6 @@ import java.util.Calendar; import java.util.GregorianCalendar; -import java.math.BigDecimal; public class IntermediaQueryEngine extends BaseQueryEngine { Modified: ccm-cms/trunk/src/com/arsdigita/cms/search/VersionFilterSpecification.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/search/VersionFilterSpecification.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/search/VersionFilterSpecification.java 2005-09-02 13:26:17 UTC (rev 752) @@ -20,7 +20,6 @@ import com.arsdigita.search.FilterSpecification; -import com.arsdigita.util.Assert; /** * A filter specification for content item versions Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java 2005-09-02 13:26:17 UTC (rev 752) @@ -20,14 +20,9 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.RequestLocal; -import com.arsdigita.bebop.SingleSelectionModel; -import com.arsdigita.cms.Folder; -import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.kernel.ACSObject; -import com.arsdigita.util.UncheckedWrapperException; import org.apache.log4j.Logger; -import java.math.BigDecimal; public class ACSObjectRequestLocal extends RequestLocal { public static final String versionId = Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/BrowsePane.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/BrowsePane.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/BrowsePane.java 2005-09-02 13:26:17 UTC (rev 752) @@ -24,19 +24,13 @@ import com.arsdigita.bebop.Resettable; import com.arsdigita.bebop.SegmentedPanel; import com.arsdigita.bebop.SingleSelectionModel; -import com.arsdigita.bebop.event.ChangeEvent; -import com.arsdigita.bebop.event.ChangeListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSubmissionListener; -import com.arsdigita.bebop.event.TreeExpansionEvent; import com.arsdigita.bebop.event.ActionEvent; import com.arsdigita.bebop.event.ActionListener; -import com.arsdigita.bebop.event.TreeExpansionListener; import com.arsdigita.cms.CMS; import com.arsdigita.cms.Folder; -import com.arsdigita.cms.ItemSelectionModel; -import com.arsdigita.cms.ui.folder.FolderBrowser; import com.arsdigita.cms.ui.folder.FolderRequestLocal; import com.arsdigita.cms.ui.folder.FolderSelectionModel; import com.arsdigita.cms.ui.folder.FolderTreeModelBuilder; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentItemPage.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentItemPage.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentItemPage.java 2005-09-02 13:26:17 UTC (rev 752) @@ -23,7 +23,6 @@ import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Link; -import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.Resettable; import com.arsdigita.bebop.SimpleContainer; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentSectionPage.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentSectionPage.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ContentSectionPage.java 2005-09-02 13:26:17 UTC (rev 752) @@ -20,7 +20,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.TabbedPane; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ControlButton.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ControlButton.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ControlButton.java 2005-09-02 13:26:17 UTC (rev 752) @@ -21,7 +21,6 @@ import com.arsdigita.bebop.ControlLink; import com.arsdigita.bebop.Image; import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.ToggleLink; import com.arsdigita.bebop.event.ActionListener; import com.arsdigita.cms.dispatcher.Utilities; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/FolderContent.java 2005-09-02 13:26:17 UTC (rev 752) @@ -20,32 +20,17 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleComponent; -import com.arsdigita.categorization.CategorizedCollection; -import com.arsdigita.categorization.CategorizedObject; -import com.arsdigita.categorization.Category; import com.arsdigita.cms.CMS; -import com.arsdigita.cms.ContentBundle; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSectionCollection; import com.arsdigita.cms.Folder; import com.arsdigita.cms.dispatcher.SimpleXMLGenerator; import com.arsdigita.domain.DomainObjectXMLRenderer; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataQuery; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.Session; -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.util.Assert; import com.arsdigita.xml.Element; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; import org.apache.log4j.Logger; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ImageChooser.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ImageChooser.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ImageChooser.java 2005-09-02 13:26:17 UTC (rev 752) @@ -37,7 +37,6 @@ import com.arsdigita.bebop.event.TableActionListener; import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.form.TextField; -import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.util.GlobalizationUtil; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearch.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearch.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearch.java 2005-09-02 13:26:17 UTC (rev 752) @@ -23,7 +23,6 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.Resettable; import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.search.QuerySpecification; import com.arsdigita.search.ui.QueryGenerator; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchPopup.java 2005-09-02 13:26:17 UTC (rev 752) @@ -23,7 +23,6 @@ import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.parameters.StringParameter; -import com.arsdigita.cms.ContentItem; import com.arsdigita.persistence.OID; import com.arsdigita.xml.Element; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSection.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSection.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSection.java 2005-09-02 13:26:17 UTC (rev 752) @@ -22,7 +22,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.Container; -import com.arsdigita.bebop.BoxPanel; import com.arsdigita.bebop.Resettable; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormSection; @@ -30,13 +29,9 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.bebop.parameters.BigDecimalParameter; -import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ui.search.ItemQueryComponent; -import com.arsdigita.util.LockableImpl; -import com.arsdigita.search.Search; import com.arsdigita.search.ui.ResultsPane; import com.arsdigita.search.ui.QueryGenerator; import com.arsdigita.search.QuerySpecification; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java 2005-09-02 13:26:17 UTC (rev 752) @@ -21,14 +21,9 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Container; -import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.List; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.Page; -import com.arsdigita.bebop.form.Option; -import com.arsdigita.bebop.form.RadioGroup; import com.arsdigita.bebop.form.Submit; -import com.arsdigita.bebop.list.ListCellRenderer; import com.arsdigita.toolbox.ui.OIDParameter; import com.arsdigita.persistence.OID; import com.arsdigita.cms.ContentItem; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchWidget.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchWidget.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/ItemSearchWidget.java 2005-09-02 13:26:17 UTC (rev 752) @@ -40,13 +40,10 @@ import com.arsdigita.cms.ContentType; import com.arsdigita.cms.dispatcher.ContentCenterDispatcher; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.persistence.OID; import com.arsdigita.web.ParameterMap; import com.arsdigita.web.URL; import org.apache.log4j.Logger; -import java.math.BigDecimal; /** * A class representing a content item search field in an HTML form. Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/PartyAddForm.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/PartyAddForm.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/PartyAddForm.java 2005-09-02 13:26:17 UTC (rev 752) @@ -18,7 +18,6 @@ */ package com.arsdigita.cms.ui; - import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.Form; import com.arsdigita.bebop.FormData; @@ -30,7 +29,6 @@ import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.event.PrintEvent; import com.arsdigita.bebop.event.PrintListener; import com.arsdigita.bebop.form.CheckboxGroup; @@ -42,10 +40,8 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.persistence.DataQuery; -import com.arsdigita.toolbox.ui.*; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; - import java.math.BigDecimal; import java.util.TooManyListenersException; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java 2005-09-02 13:26:17 UTC (rev 752) @@ -53,10 +53,8 @@ import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.User; -import com.arsdigita.kernel.permissions.PermissionManager; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; -import com.arsdigita.kernel.permissions.UniversalPermissionDescriptor; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.persistence.CompoundFilter; import com.arsdigita.persistence.DataQuery; @@ -65,7 +63,6 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; -import com.arsdigita.util.StringUtils; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.RedirectSignal; import com.arsdigita.web.Web; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/UserAddForm.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/UserAddForm.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/UserAddForm.java 2005-09-02 13:26:17 UTC (rev 752) @@ -29,7 +29,6 @@ import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.event.PrintEvent; import com.arsdigita.bebop.event.PrintListener; import com.arsdigita.bebop.form.CheckboxGroup; @@ -41,10 +40,8 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.persistence.DataQuery; -import com.arsdigita.toolbox.ui.*; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; - import java.math.BigDecimal; import java.util.TooManyListenersException; Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/WorkspacePage.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/ui/WorkspacePage.java 2005-09-02 13:22:34 UTC (rev 751) +++ ccm-cms/trunk/src/com/arsdigita/cms/ui/WorkspacePage.java 2005-09-02 13:26:17 UTC (rev 752) @@ -21,7 +21,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Link; -import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.TabbedPane; @@ -33,17 +32,13 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.Folder; import com.arsdigita.cms.dispatcher.CMSPage; import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.kernel.KernelHelper; import com.arsdigita.kernel.User; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.util.Assert; .. |
From: <ssk...@vh...> - 2005-09-02 13:32:05
|
Author: sskracic Date: 2005-09-02 15:22:34 +0200 (Fri, 02 Sep 2005) New Revision: 751 Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/FreeformContentItem.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Initializer.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Loader.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/AssetCollection.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/FreeformBinaryAsset.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/AssetSelectionModel.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/DefineAssetView.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadForm.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadSection.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetTable.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetView.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformBinaryAssetEdit.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformTextAssetEdit.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTable.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTableModelBuilder.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/ViewAssets.java Log: NFC: import trim in ccm-ldn-freeform. Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/FreeformContentItem.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/FreeformContentItem.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/FreeformContentItem.java 2005-09-02 13:22:34 UTC (rev 751) @@ -8,11 +8,9 @@ import com.arsdigita.domain.DomainObject; import com.arsdigita.persistence.DataAssociationCursor; import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.DataQuery; -import com.arsdigita.persistence.Filter; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Initializer.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Initializer.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Initializer.java 2005-09-02 13:22:34 UTC (rev 751) @@ -18,9 +18,12 @@ package com.arsdigita.london.cms.freeform; -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; /** * The CMS initializer. Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Loader.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Loader.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Loader.java 2005-09-02 13:22:34 UTC (rev 751) @@ -18,28 +18,19 @@ package com.arsdigita.london.cms.freeform; -import com.arsdigita.db.*; -import com.arsdigita.domain.*; -import com.arsdigita.runtime.*; -import com.arsdigita.installer.SQLLoader; -import com.arsdigita.loader.*; -import com.arsdigita.mimetypes.*; -import com.arsdigita.util.*; -import com.arsdigita.util.config.*; -import com.arsdigita.util.csv.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; -import com.arsdigita.portal.*; -import com.arsdigita.web.HostLoader; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.sql.*; - +import com.arsdigita.db.DbHelper; +import com.arsdigita.loader.PackageLoader; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.runtime.Script; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.runtime.Startup; +import com.arsdigita.util.config.JavaPropertyLoader; +import com.arsdigita.util.jdbc.Connections; +import java.sql.Connection; import org.apache.log4j.Logger; /** Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/AssetCollection.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/AssetCollection.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/AssetCollection.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,13 +1,10 @@ package com.arsdigita.london.cms.freeform.asset; import com.arsdigita.cms.Asset; -import com.arsdigita.cms.BinaryAsset; import com.arsdigita.cms.ContentItem; -import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainCollection; import com.arsdigita.kernel.ACSObject; import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.OID; import java.math.BigDecimal; import com.arsdigita.domain.DomainObjectFactory; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/FreeformBinaryAsset.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/FreeformBinaryAsset.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/asset/FreeformBinaryAsset.java 2005-09-02 13:22:34 UTC (rev 751) @@ -2,7 +2,6 @@ import java.math.BigDecimal; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.ACSObject; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.cms.BinaryAsset; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/AssetSelectionModel.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/AssetSelectionModel.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/AssetSelectionModel.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,7 +1,6 @@ package com.arsdigita.london.cms.freeform.ui; import com.arsdigita.london.cms.freeform.FreeformContentItem; -import com.arsdigita.london.cms.freeform.asset.AssetCollection; import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Page; @@ -12,16 +11,11 @@ import com.arsdigita.bebop.event.ChangeListener; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; -import com.arsdigita.bebop.table.TableModel; import com.arsdigita.cms.Asset; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataAssociationCursor; -import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.toolbox.ui.DomainObjectSelectionModel; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/DefineAssetView.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/DefineAssetView.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/DefineAssetView.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,15 +1,10 @@ package com.arsdigita.london.cms.freeform.ui; import com.arsdigita.bebop.Component; -import com.arsdigita.bebop.form.SingleSelect; -import com.arsdigita.bebop.form.OptionGroup; -import com.arsdigita.bebop.jsp.*; +import com.arsdigita.bebop.jsp.DefineComponent; import com.arsdigita.bebop.parameters.ParameterModel; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.servlet.jsp.tagext.*; -import javax.servlet.jsp.*; +import javax.servlet.jsp.JspException; import java.math.BigDecimal; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadForm.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadForm.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadForm.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,8 +1,9 @@ package com.arsdigita.london.cms.freeform.ui; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.event.*; +import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.Container; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.parameters.NotNullValidationListener; /** Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadSection.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadSection.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FileUploadSection.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,8 +1,12 @@ package com.arsdigita.london.cms.freeform.ui; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.event.*; +import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.Container; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.FormSection; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.form.FileUpload; +import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.dispatcher.MultipartHttpServletRequest; import java.io.File; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetTable.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetTable.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetTable.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,14 +1,11 @@ package com.arsdigita.london.cms.freeform.ui; import com.arsdigita.london.cms.freeform.FreeformContentItem; -import com.arsdigita.cms.Asset; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.Paginator; import com.arsdigita.bebop.Table; -import com.arsdigita.bebop.table.DefaultTableCellRenderer; -import com.arsdigita.bebop.table.DefaultTableColumnModel; import com.arsdigita.bebop.table.TableColumn; import com.arsdigita.bebop.table.TableColumnModel; import com.arsdigita.bebop.table.TableModel; @@ -16,8 +13,6 @@ import com.arsdigita.bebop.event.TableActionEvent; import com.arsdigita.bebop.event.TableActionListener; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.SessionManager; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetView.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetView.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformAssetView.java 2005-09-02 13:22:34 UTC (rev 751) @@ -7,13 +7,9 @@ import com.arsdigita.bebop.Link; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.RequestLocal; -import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.SingleSelectionModel; import com.arsdigita.bebop.SingleSelectionModel; import com.arsdigita.bebop.Table; -import com.arsdigita.bebop.event.PrintEvent; -import com.arsdigita.bebop.event.PrintListener; import com.arsdigita.bebop.table.DefaultTableColumnModel; import com.arsdigita.bebop.table.TableColumn; import com.arsdigita.bebop.table.TableColumnModel; @@ -22,12 +18,8 @@ import com.arsdigita.cms.Asset; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.mimetypes.MimeType; -import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.persistence.OID; import com.arsdigita.util.LockableImpl; -import java.math.BigDecimal; /** * A component to view one asset which displays the name, Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformBinaryAssetEdit.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformBinaryAssetEdit.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformBinaryAssetEdit.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,35 +1,21 @@ package com.arsdigita.london.cms.freeform.ui; -import com.arsdigita.london.cms.freeform.FreeformContentItem; import com.arsdigita.london.cms.freeform.asset.FreeformBinaryAsset; import com.arsdigita.bebop.ColumnPanel; -import com.arsdigita.bebop.FormData; -import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SaveCancelSection; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.event.FormInitListener; -import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.bebop.event.PrintEvent; -import com.arsdigita.bebop.event.PrintListener; -import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Container; import com.arsdigita.bebop.SingleSelectionModel; -import com.arsdigita.bebop.form.Option; -import com.arsdigita.bebop.form.SingleSelect; import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.Label; import com.arsdigita.cms.ItemSelectionModel; -import com.arsdigita.cms.ui.authoring.TextAssetBody; -import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.TextAsset; -import java.math.BigDecimal; /** Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformTextAssetEdit.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformTextAssetEdit.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/FreeformTextAssetEdit.java 2005-09-02 13:22:34 UTC (rev 751) @@ -2,11 +2,7 @@ import com.arsdigita.bebop.form.FormErrorDisplay; import com.arsdigita.bebop.ColumnPanel; -import com.arsdigita.cms.ui.UniqueItemNameValidationListener; import com.arsdigita.cms.Asset; -import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.persistence.OID; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.event.FormInitListener; @@ -14,16 +10,14 @@ import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.util.Assert; -import com.arsdigita.bebop.Container; -import com.arsdigita.london.cms.freeform.assets.*; +import com.arsdigita.london.cms.freeform.assets.FreeformTextAsset; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SingleSelectionModel; import com.arsdigita.bebop.form.SingleSelect; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ui.authoring.TextAssetBody; -import com.arsdigita.london.cms.freeform.*; +import com.arsdigita.london.cms.freeform.FreeformContentItem; import com.arsdigita.db.Sequences; import com.arsdigita.util.UncheckedWrapperException; import java.math.BigDecimal; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTable.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTable.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTable.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,9 +1,11 @@ package com.arsdigita.london.cms.freeform.ui; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.PaginationModelBuilder; +import com.arsdigita.bebop.Paginator; +import com.arsdigita.bebop.Table; import com.arsdigita.bebop.table.DefaultTableColumnModel; import com.arsdigita.bebop.table.TableColumnModel; -import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.persistence.DataQuery; import com.arsdigita.toolbox.ui.QueryEvent; import com.arsdigita.toolbox.ui.QueryListener; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTableModelBuilder.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTableModelBuilder.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/PaginationTableModelBuilder.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,6 +1,10 @@ package com.arsdigita.london.cms.freeform.ui; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.PaginationModelBuilder; +import com.arsdigita.bebop.Paginator; +import com.arsdigita.bebop.RequestLocal; +import com.arsdigita.bebop.Table; import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.persistence.DataQuery; Modified: ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/ViewAssets.java =================================================================== --- ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/ViewAssets.java 2005-09-02 12:55:24 UTC (rev 750) +++ ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/ui/ViewAssets.java 2005-09-02 13:22:34 UTC (rev 751) @@ -1,7 +1,7 @@ package com.arsdigita.london.cms.freeform.ui; import com.arsdigita.london.cms.freeform.FreeformContentItem; -import com.arsdigita.london.cms.freeform.asset.*; +import com.arsdigita.london.cms.freeform.asset.FreeformBinaryAsset; import com.arsdigita.cms.Asset; import com.arsdigita.cms.ItemSelectionModel; @@ -9,17 +9,21 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; import com.arsdigita.bebop.ActionLink; -import com.arsdigita.bebop.BoxPanel; import com.arsdigita.bebop.Container; import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.Paginator; -import com.arsdigita.bebop.SingleSelectionModel; -import com.arsdigita.bebop.event.*; +import com.arsdigita.bebop.event.ActionEvent; +import com.arsdigita.bebop.event.ActionListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormSubmissionListener; +import com.arsdigita.bebop.event.PrintEvent; +import com.arsdigita.bebop.event.PrintListener; +import com.arsdigita.bebop.event.TableActionEvent; +import com.arsdigita.bebop.event.TableActionListener; import com.arsdigita.bebop.table.TableColumn; |
From: <ssk...@vh...> - 2005-09-02 13:04:08
|
Author: sskracic Date: 2005-09-02 14:55:24 +0200 (Fri, 02 Sep 2005) New Revision: 750 Modified: ccm-core/trunk/test/src/com/arsdigita/runtime/StartupTest.java Log: NFC: ... and final import trim in ccm-core/test/src. Modified: ccm-core/trunk/test/src/com/arsdigita/runtime/StartupTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/runtime/StartupTest.java 2005-09-02 12:52:23 UTC (rev 749) +++ ccm-core/trunk/test/src/com/arsdigita/runtime/StartupTest.java 2005-09-02 12:55:24 UTC (rev 750) @@ -23,7 +23,7 @@ import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.MetadataRoot; -import junit.framework.*; +import junit.framework.TestCase; public class StartupTest extends TestCase { |
From: <ssk...@vh...> - 2005-09-02 13:01:21
|
Author: sskracic Date: 2005-09-02 14:52:23 +0200 (Fri, 02 Sep 2005) New Revision: 749 Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java ccm-core/trunk/src/com/arsdigita/runtime/CCM.java ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java Log: NFC: final import trim of ccm-core. Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java 2005-09-02 12:38:44 UTC (rev 748) +++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java 2005-09-02 12:52:23 UTC (rev 749) @@ -40,7 +40,6 @@ import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; -import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/arsdigita/runtime/CCM.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/runtime/CCM.java 2005-09-02 12:38:44 UTC (rev 748) +++ ccm-core/trunk/src/com/arsdigita/runtime/CCM.java 2005-09-02 12:52:23 UTC (rev 749) @@ -19,14 +19,9 @@ package com.arsdigita.runtime; import com.arsdigita.util.UncheckedWrapperException; -//import com.arsdigita.util.*; -//import com.arsdigita.util.jdbc.*; -//import com.arsdigita.util.parameter.*; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -//import java.sql.*; -//import java.util.*; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java 2005-09-02 12:38:44 UTC (rev 748) +++ ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java 2005-09-02 12:52:23 UTC (rev 749) @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.collections.list.*; +import org.apache.commons.collections.list.SetUniqueList; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java 2005-09-02 12:38:44 UTC (rev 748) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java 2005-09-02 12:52:23 UTC (rev 749) @@ -34,7 +34,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.primitives.*; +import org.apache.commons.collections.primitives.ArrayCharList; +import org.apache.commons.collections.primitives.CharList; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java 2005-09-02 12:38:44 UTC (rev 748) +++ ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java 2005-09-02 12:52:23 UTC (rev 749) @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.Map; -import org.apache.commons.collections.list.*; +import org.apache.commons.collections.list.SetUniqueList; /** * MultiMap Modified: ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java 2005-09-02 12:38:44 UTC (rev 748) +++ ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java 2005-09-02 12:52:23 UTC (rev 749) @@ -36,7 +36,7 @@ import java.util.Map.Entry; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.list.*; +import org.apache.commons.collections.list.SetUniqueList; import org.apache.log4j.Logger; /** |
Author: sskracic Date: 2005-09-02 14:38:44 +0200 (Fri, 02 Sep 2005) New Revision: 748 Modified: ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadedMessageTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java ccm-core/trunk/test/src/com/arsdigita/notification/NotificationTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataOperationTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DynamicNodeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceSuite.java ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/EmptyXMLResult.java ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java ccm-core/trunk/test/src/com/arsdigita/util/DummyServletContext.java ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java ccm-core/trunk/test/src/com/arsdigita/util/OrderedMapTest.java ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/TaskDefinitionTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/TaskTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/WorkflowProcess2Test.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/WorkflowProcessTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/WorkflowProcessTestHarness.java ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLTestCase.java ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java Log: NFC: one more pass at import trim. Modified: ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,15 +18,11 @@ */ package com.arsdigita.auditing; -import com.arsdigita.kernel.Kernel; -import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import junit.extensions.TestDecorator; import junit.framework.Test; -import junit.framework.TestResult; /** * AuditingSuite Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,8 +18,6 @@ */ package com.arsdigita.bebop; -import com.arsdigita.util.HttpServletDummyRequest; -import com.arsdigita.util.HttpServletDummyResponse; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java 2005-09-02 12:38:44 UTC (rev 748) @@ -21,7 +21,6 @@ import com.arsdigita.bebop.Form; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.XMLComponentRegressionBase; -import com.arsdigita.util.RequestEnvironment; /** * Fixture for regression tests for widgets Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -24,8 +24,6 @@ import com.arsdigita.bebop.event.ActionListener; import com.arsdigita.bebop.event.PrintEvent; import com.arsdigita.bebop.event.PrintListener; -import com.arsdigita.util.HttpServletDummyRequest; -import com.arsdigita.util.HttpServletDummyResponse; /** * Regression tests for the text field widget Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.categorization; -import com.arsdigita.developersupport.Debug; import com.arsdigita.domain.DomainServiceInterfaceExposer; import com.arsdigita.persistence.DataAssociation; import com.arsdigita.persistence.DataAssociationCursor; Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,7 +19,6 @@ package com.arsdigita.categorization; import com.arsdigita.developersupport.Debug; -import com.arsdigita.developersupport.SQLDebugger; import com.arsdigita.kernel.Group; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; Modified: ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,8 +22,6 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.runtime.RuntimeConfig; -import com.arsdigita.tools.junit.extensions.BaseTestSetup; -import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.extensions.TestDecorator; import junit.framework.Protectable; Modified: ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -21,7 +21,6 @@ import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.SessionManager; import com.arsdigita.tools.junit.framework.BaseTestCase; -import com.arsdigita.util.Assert; import java.util.ArrayList; import java.util.List; Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,9 +18,6 @@ */ package com.arsdigita.formbuilder.test; -import com.arsdigita.bebop.Form; -import com.arsdigita.formbuilder.PersistentTextArea; -import com.arsdigita.formbuilder.util.FormBuilderUtil; import com.arsdigita.util.UncheckedWrapperException; import java.lang.reflect.Method; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java 2005-09-02 12:38:44 UTC (rev 748) @@ -25,7 +25,6 @@ import com.arsdigita.formbuilder.util.FormBuilderUtil; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; -import com.arsdigita.util.UncheckedWrapperException; import java.math.BigDecimal; import java.util.HashMap; import java.util.Iterator; Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -20,7 +20,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.form.Date; -import com.arsdigita.bebop.parameters.DateParameter; import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.formbuilder.PersistentDate; import java.util.HashMap; Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -21,7 +21,6 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.FormSection; import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.formbuilder.PersistentFormSection; import com.arsdigita.formbuilder.PersistentLabel; @@ -29,10 +28,6 @@ import com.arsdigita.formbuilder.PersistentSubmit; import com.arsdigita.formbuilder.PersistentTextArea; import com.arsdigita.formbuilder.PersistentTextField; -import com.arsdigita.formbuilder.util.FormBuilderUtil; -import com.arsdigita.persistence.DataCollection; -import java.util.Collection; -import java.util.Iterator; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java 2005-09-02 12:38:44 UTC (rev 748) @@ -20,14 +20,9 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataAssociationCursor; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.metadata.ObjectType; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; /** Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,15 +19,9 @@ package com.arsdigita.kernel; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataAssociationCursor; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.metadata.ObjectType; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; /** Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.kernel; -import com.arsdigita.db.Sequences; import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObject; import com.arsdigita.persistence.OID; Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.kernel; -import com.arsdigita.db.Sequences; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,12 +18,10 @@ */ package com.arsdigita.kernel; -import com.arsdigita.db.Sequences; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.Filter; import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; -import java.sql.SQLException; import junit.framework.Test; import junit.framework.TestSuite; Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -20,7 +20,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.tools.junit.framework.BaseTestCase; Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,10 +18,8 @@ */ package com.arsdigita.messaging; -import com.arsdigita.domain.DataObjectNotFoundException; import java.io.File; import java.util.Iterator; -import javax.activation.DataHandler; /** * Test cases for attachments. Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.messaging; -import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.User; Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadedMessageTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadedMessageTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadedMessageTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,9 +22,7 @@ import com.arsdigita.kernel.Party; import com.arsdigita.kernel.SiteNode; import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.DataQuery; -import com.arsdigita.persistence.Filter; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import java.math.BigDecimal; Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,21 +18,9 @@ */ package com.arsdigita.metadata; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataAssociationCursor; import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.DataOperation; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.metadata.Association; import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.metadata.ObjectType; -import com.arsdigita.persistence.metadata.Property; -import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.JoinThrough; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Iterator; import java.util.List; Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -42,7 +42,6 @@ import com.redhat.persistence.metadata.Value; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Collection; import java.util.Date; import java.util.Iterator; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/notification/NotificationTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/NotificationTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/notification/NotificationTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,17 +19,12 @@ package com.arsdigita.notification; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.EmailAddress; -import com.arsdigita.kernel.Party; -import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.User; import com.arsdigita.mail.ByteArrayDataSource; -import com.arsdigita.mail.Mail; import com.arsdigita.messaging.Message; import com.arsdigita.messaging.MessagePart; import com.arsdigita.persistence.OID; import com.arsdigita.tools.junit.framework.BaseTestCase; -import com.arsdigita.util.StringUtils; import javax.activation.DataHandler; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataOperationTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataOperationTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataOperationTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence; -import com.arsdigita.db.ConnectionManager; import com.arsdigita.db.DbHelper; import java.math.BigDecimal; import java.util.Date; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -26,7 +26,6 @@ import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,8 +19,6 @@ package com.arsdigita.persistence; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; /** * DataQueryTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DynamicNodeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DynamicNodeTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DynamicNodeTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence; -import org.apache.log4j.Logger; /** * DyamicNodeTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,11 +18,8 @@ */ package com.arsdigita.persistence; -import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Iterator; -import java.util.LinkedList; /** * GenericDataObjectText Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java 2005-09-02 12:38:44 UTC (rev 748) @@ -25,7 +25,6 @@ import java.util.Iterator; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.apache.log4j.Priority; /** * ObjectTypeValidator Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,7 +19,6 @@ package com.arsdigita.persistence; import java.math.BigDecimal; -import java.sql.SQLException; import java.util.HashSet; import java.util.Set; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,7 +22,6 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; -import junit.framework.TestCase; /** * PersistenceSuite Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java 2005-09-02 12:38:44 UTC (rev 748) @@ -24,7 +24,6 @@ import com.arsdigita.persistence.pdl.PDLOutputter; import com.redhat.persistence.engine.rdbms.RDBMSEngine; import java.io.File; -import java.io.InputStream; import java.util.HashSet; import java.util.Set; import junit.framework.TestCase; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -20,7 +20,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; Modified: ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,10 +18,8 @@ */ package com.arsdigita.runtime; -import com.arsdigita.tools.junit.extensions.BaseTestSetup; -import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import junit.framework.*; +import junit.framework.Test; /** * RuntimeSuite Modified: ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,8 +18,6 @@ */ package com.arsdigita.search; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.search.filters.ObjectTypeFilterSpecification; import com.arsdigita.search.filters.ObjectTypeFilterType; import com.arsdigita.tools.junit.framework.BaseTestCase; import java.util.Iterator; Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -27,7 +27,9 @@ import java.util.Collection; import java.util.Iterator; import java.util.TreeSet; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java 2005-09-02 12:38:44 UTC (rev 748) @@ -27,7 +27,6 @@ import com.arsdigita.persistence.DataAssociation; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import java.math.BigDecimal; /** * SearchTestChapter class. Used to test SearchTestHelp class Modified: ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,7 +19,6 @@ package com.arsdigita.search.lucene; import com.arsdigita.search.Search; -import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; import org.apache.log4j.Logger; import org.apache.lucene.analysis.standard.StandardAnalyzer; Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -30,11 +30,12 @@ import com.arsdigita.persistence.TransactionContext; import com.arsdigita.sitenode.SiteNodeDispatcher; import java.util.Enumeration; -import javax.servlet.*; -import javax.servlet.http.*; -import junit.framework.*; -import org.apache.cactus.*; -import org.apache.cactus.util.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.cactus.ServletTestCase; +import org.apache.cactus.WebRequest; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -20,9 +20,7 @@ import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import junit.framework.*; -import org.apache.cactus.*; -import org.apache.cactus.util.*; +import org.apache.cactus.ServletTestCase; public class PersistenceCactusTest extends ServletTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -23,11 +23,13 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.sitenode.SiteNodeDispatcher; import java.io.IOException; -import javax.servlet.*; -import javax.servlet.http.*; -import junit.framework.*; -import org.apache.cactus.*; -import org.apache.cactus.util.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.cactus.ServletTestCase; +import org.apache.cactus.ServletURL; +import org.apache.cactus.WebRequest; import org.apache.log4j.Logger; public class SiteNodeDispatcherCactusTest extends ServletTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,7 +19,7 @@ package com.arsdigita.sitenode; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import junit.framework.*; +import junit.framework.Test; public class SiteNodeSuite extends PackageTestSuite { Modified: ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,9 +18,14 @@ */ package com.arsdigita.test; -import com.arsdigita.kernel.EmailAddress; import com.arsdigita.util.UncheckedWrapperException; -import com.meterware.httpunit.*; +import com.meterware.httpunit.GetMethodWebRequest; +import com.meterware.httpunit.SubmitButton; +import com.meterware.httpunit.WebConversation; +import com.meterware.httpunit.WebForm; +import com.meterware.httpunit.WebLink; +import com.meterware.httpunit.WebRequest; +import com.meterware.httpunit.WebResponse; import java.io.IOException; import org.xml.sax.SAXException; Modified: ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,8 +19,13 @@ package com.arsdigita.test; import com.arsdigita.web.URL; -import com.meterware.httpunit.*; -import junit.framework.*; +import com.meterware.httpunit.WebConversation; +import com.meterware.httpunit.WebForm; +import com.meterware.httpunit.WebLink; +import com.meterware.httpunit.WebRequest; +import com.meterware.httpunit.WebResponse; +import com.meterware.httpunit.WebTable; +import junit.framework.TestCase; /** * Modified: ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.Reader; -import junit.framework.*; +import junit.framework.TestCase; /** * DDLDiffTest Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java 2005-09-02 12:38:44 UTC (rev 748) @@ -27,7 +27,6 @@ import com.arsdigita.util.SystemProperties; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.StringArrayParameter; -import org.apache.commons.beanutils.converters.*; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java 2005-09-02 12:38:44 UTC (rev 748) @@ -20,13 +20,7 @@ import com.arsdigita.initializer.InitializationException; import com.arsdigita.initializer.Startup; -import com.arsdigita.util.ResourceManager; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.Reader; import java.util.Collection; -import junit.extensions.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,8 +22,8 @@ import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.TimedTestRecord; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import com.clarkware.junitperf.*; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; /** * <P>Example of {@link TimedTestRecord} usage </P> Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,8 +22,6 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.Map; -import junit.extensions.TestDecorator; -import junit.framework.Test; /** * <P> This class encapsulates data about a particular testcase. It is used Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,10 +18,7 @@ package com.arsdigita.tools.junit.extensions; -import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.Session; import com.arsdigita.runtime.Startup; -import java.sql.Connection; import java.util.Collection; import java.util.Collections; import java.util.HashSet; Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,10 +22,8 @@ import com.arsdigita.util.UncheckedWrapperException; import com.clarkware.junitperf.TimedTest; import junit.extensions.TestDecorator; -import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestResult; -import junit.framework.TestSuite; /** * <P>This test decorator is used to decorate <code>TestCases</code> only. Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,7 +22,7 @@ import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import java.util.Locale; -import junit.framework.*; +import junit.framework.TestCase; import org.apache.log4j.Logger; public abstract class BaseTestCase extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,7 +22,9 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * PackageTestSuite Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/EmptyXMLResult.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/EmptyXMLResult.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/EmptyXMLResult.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.tools.junit.results; -import com.arsdigita.util.Assert; /** * EmptyXMLResult Modified: ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -31,10 +31,13 @@ import com.arsdigita.ui.login.UserNewForm; import com.arsdigita.ui.login.UserRegistrationForm; import com.arsdigita.web.Web; -import com.meterware.httpunit.*; +import com.meterware.httpunit.WebForm; +import com.meterware.httpunit.WebRequest; +import com.meterware.httpunit.WebResponse; import java.math.BigDecimal; import java.sql.SQLException; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestSuite; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java 2005-09-02 12:38:44 UTC (rev 748) @@ -21,8 +21,8 @@ import com.arsdigita.dispatcher.RequestContext; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; /** * Dummy RequestContext object for unit testing of form methods that Modified: ccm-core/trunk/test/src/com/arsdigita/util/DummyServletContext.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/DummyServletContext.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/util/DummyServletContext.java 2005-09-02 12:38:44 UTC (rev 748) @@ -24,7 +24,12 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Set; -import javax.servlet.*; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,8 +18,6 @@ */ package com.arsdigita.util; -import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import junit.framework.TestCase; Modified: ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,7 +22,6 @@ import java.io.StringWriter; import java.util.Arrays; import java.util.Collections; -import java.util.Iterator; import java.util.List; import junit.framework.TestCase; Modified: ccm-core/trunk/test/src/com/arsdigita/util/OrderedMapTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/OrderedMapTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/util/OrderedMapTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -19,7 +19,7 @@ package com.arsdigita.util; import java.util.Iterator; -import junit.framework.*; +import junit.framework.TestCase; /** * @author Jim Parsons Modified: ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java 2005-09-02 12:38:44 UTC (rev 748) @@ -21,7 +21,11 @@ import java.io.IOException; import java.util.HashMap; import java.util.StringTokenizer; -import javax.servlet.*; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import org.apache.cactus.ServletURL; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java 2005-09-02 12:38:44 UTC (rev 748) @@ -22,7 +22,6 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; -import org.apache.log4j.BasicConfigurator; /** * URLTestSuite Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java 2005-09-02 12:11:57 UTC (rev 747) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java 2005-09-02 12:38:44 UTC (rev 748) @@ -18,7 +18,6 @@ */ package com.arsdigita.versioning; .. |
From: <ssk...@vh...> - 2005-09-02 12:21:02
|
Author: sskracic Date: 2005-09-02 14:11:57 +0200 (Fri, 02 Sep 2005) New Revision: 747 Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionImplTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DatatypeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/KeyGenerator.java ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceWrapper.java ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java Log: NFC: more import trimming. Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -18,7 +18,7 @@ */ package com.arsdigita.mail; -import javax.mail.*; +import javax.mail.MessagingException; import junit.framework.TestCase; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -18,9 +18,7 @@ */ package com.arsdigita.mail; -import javax.activation.*; -import javax.mail.*; -import javax.mail.internet.*; +import javax.mail.MessagingException; import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java 2005-09-02 12:11:57 UTC (rev 747) @@ -21,7 +21,7 @@ import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import junit.framework.*; +import junit.framework.Test; /** * MailSuite Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -21,9 +21,8 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import javax.activation.*; -import javax.mail.*; -import javax.mail.internet.*; +import javax.activation.DataHandler; +import javax.mail.MessagingException; import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -19,7 +19,7 @@ package com.arsdigita.messaging; import java.net.URL; -import javax.activation.*; +import javax.activation.DataHandler; /** * Test cases for MessageParts. Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java 2005-09-02 12:11:57 UTC (rev 747) @@ -22,7 +22,7 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import junit.framework.*; +import junit.framework.Test; /** * Messaging test suite. Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java 2005-09-02 12:11:57 UTC (rev 747) @@ -24,7 +24,7 @@ import com.arsdigita.persistence.pdl.PDL; import java.util.HashSet; import java.util.Set; -import junit.framework.*; +import junit.framework.TestCase; /** * PersistenceTestCase Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -19,8 +19,6 @@ package com.arsdigita.persistence; import java.math.BigInteger; -import junit.extensions.*; -import junit.framework.*; import org.apache.log4j.varia.DenyAllFilter; import org.apache.log4j.varia.StringMatchFilter; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -20,7 +20,6 @@ import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; -import junit.framework.*; /** * DataCollectionImplTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionImplTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionImplTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionImplTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -21,7 +21,7 @@ import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; import java.util.Calendar; -import junit.framework.*; +import junit.framework.TestSuite; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -19,7 +19,6 @@ package com.arsdigita.persistence; import com.arsdigita.persistence.metadata.ObjectType; -import junit.framework.*; public abstract class DataCollectionTest extends DataQueryTest { Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DatatypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DatatypeTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DatatypeTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -21,7 +21,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Date; -import junit.framework.*; /** * DatatypeTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/KeyGenerator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/KeyGenerator.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/KeyGenerator.java 2005-09-02 12:11:57 UTC (rev 747) @@ -29,7 +29,6 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.Map; -import org.apache.log4j.*; /** * KeyGenerator Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java 2005-09-02 12:11:57 UTC (rev 747) @@ -23,8 +23,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; -import junit.extensions.*; -import junit.framework.*; import org.apache.log4j.Category; import org.apache.log4j.Priority; import org.apache.log4j.TTCCLayout; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java 2005-09-02 12:11:57 UTC (rev 747) @@ -21,7 +21,6 @@ import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; import java.util.Date; -import junit.framework.*; /* This is a utiliy class for creating an Order and a DataAssociation set of * LineItems. Used internally by testing classes. Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceWrapper.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceWrapper.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceWrapper.java 2005-09-02 12:11:57 UTC (rev 747) @@ -18,9 +18,9 @@ */ package com.arsdigita.persistence; -import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestSuite; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -19,7 +19,10 @@ package com.arsdigita.persistence; import com.arsdigita.util.UncheckedWrapperException; -import com.mockobjects.sql.*; +import com.mockobjects.sql.MockConnection; +import com.mockobjects.sql.MockDatabaseMetaData; +import com.mockobjects.sql.MockDriver; +import com.mockobjects.sql.MockSingleRowResultSet; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java 2005-09-02 12:11:57 UTC (rev 747) @@ -21,10 +21,9 @@ import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; import java.util.Iterator; -import junit.framework.*; -import org.apache.log4j.*; +import org.apache.log4j.Logger; +import org.apache.log4j.Priority; - /** * PropertyManipulator - This class essentially implements a Visitor/Template Method for * DataObjects and their Properties. The entry point to the framework is Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -19,8 +19,6 @@ package com.arsdigita.persistence; import java.math.BigInteger; -import junit.extensions.*; -import junit.framework.*; import org.apache.log4j.Logger; import org.apache.log4j.varia.DenyAllFilter; import org.apache.log4j.varia.StringMatchFilter; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java 2005-09-02 11:57:31 UTC (rev 746) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java 2005-09-02 12:11:57 UTC (rev 747) @@ -23,7 +23,7 @@ import com.redhat.persistence.metadata.Table; import com.redhat.persistence.metadata.UniqueKey; import java.util.ArrayList; -import junit.framework.*; +import junit.framework.TestCase; public class ConstraintTest extends TestCase { |
Author: sskracic Date: 2005-09-02 13:57:31 +0200 (Fri, 02 Sep 2005) New Revision: 746 Modified: ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java ccm-core/trunk/test/src/com/arsdigita/db/SequenceTest.java ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/CryptoTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java Log: NFC: more wildcard import trimming. Modified: ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -28,7 +28,8 @@ import java.math.BigDecimal; import java.sql.SQLException; import java.util.Date; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Tests basic functionality of auditing DomainObject Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -34,10 +34,10 @@ import java.util.ArrayList; import java.util.Collection; import javax.servlet.Servlet; -import javax.servlet.http.*; -import junit.framework.*; -import org.apache.cactus.*; -import org.apache.cactus.util.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.cactus.ServletTestCase; +import org.apache.cactus.WebRequest; /** * Tests various BeBop form processing functionality Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java 2005-09-02 11:57:31 UTC (rev 746) @@ -28,7 +28,11 @@ import java.io.StringWriter; import javax.servlet.ServletException; import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.*; +import javax.xml.transform.Templates; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java 2005-09-02 11:57:31 UTC (rev 746) @@ -22,7 +22,11 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import javax.xml.transform.*; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java 2005-09-02 11:57:31 UTC (rev 746) @@ -23,7 +23,11 @@ import java.io.FileOutputStream; import java.io.IOException; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.*; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import junit.framework.TestCase; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -24,12 +24,17 @@ import com.arsdigita.util.RequestEnvironment; import java.util.Enumeration; import java.util.Hashtable; -import javax.servlet.*; -import javax.servlet.http.*; -import junit.framework.*; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUtils; +import junit.framework.TestCase; import org.apache.log4j.Logger; -import org.w3c.dom.*; -import org.w3c.dom.traversal.*; +import org.w3c.dom.CharacterData; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.traversal.DocumentTraversal; +import org.w3c.dom.traversal.NodeFilter; +import org.w3c.dom.traversal.TreeWalker; /** * Tests saving the page state to the HttpSession. Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -24,7 +24,6 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.xml.Element; import com.arsdigita.xml.TagTestElement; -import junit.framework.*; public class TagTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -20,8 +20,7 @@ import com.arsdigita.test.HttpUnitTestCase; import com.arsdigita.util.StringUtils; -import com.meterware.httpunit.*; -import junit.framework.*; +import com.meterware.httpunit.WebResponse; import org.apache.oro.text.perl.Perl5Util; /** Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java 2005-09-02 11:57:31 UTC (rev 746) @@ -18,10 +18,8 @@ */ package com.arsdigita.bebop.jsp; -import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import com.meterware.httpunit.*; -import junit.framework.*; +import junit.framework.Test; public class BebopJSPTestSuite extends PackageTestSuite { Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -19,9 +19,7 @@ package com.arsdigita.bebop.jsp; import com.arsdigita.test.HttpUnitTestCase; -import com.meterware.httpunit.*; -import junit.framework.*; -import org.apache.oro.text.perl.Perl5Util; +import com.meterware.httpunit.WebResponse; /** * Affirmative-validation test to make sure that /bebop-demo Modified: ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -26,8 +26,10 @@ import java.io.File; import java.io.FileInputStream; import java.sql.SQLException; -import junit.extensions.*; -import junit.framework.*; +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * This test exists to exercise the database and the sundry JDBC Modified: ccm-core/trunk/test/src/com/arsdigita/db/SequenceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/db/SequenceTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/db/SequenceTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -20,7 +20,9 @@ import java.math.BigDecimal; import java.sql.SQLException; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class SequenceTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -20,8 +20,9 @@ import java.sql.SQLException; import java.util.HashMap; -import junit.extensions.*; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Modified: ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -25,11 +25,11 @@ import com.arsdigita.dispatcher.RequestEvent; import com.arsdigita.dispatcher.RequestListener; import java.io.PrintWriter; -import javax.servlet.*; -import javax.servlet.http.*; -import junit.framework.*; -import org.apache.cactus.*; -import org.apache.cactus.util.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.cactus.ServletTestCase; +import org.apache.cactus.ServletURL; +import org.apache.cactus.WebRequest; import org.apache.log4j.Logger; public class BaseDispatcherServletCactusTest extends ServletTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -21,11 +21,7 @@ import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.dispatcher.InitialRequestContext; import com.arsdigita.dispatcher.RequestContext; -import javax.servlet.*; -import javax.servlet.http.*; -import junit.framework.*; -import org.apache.cactus.*; -import org.apache.cactus.util.*; +import org.apache.cactus.ServletTestCase; public class DispatcherHelperCactusTest extends ServletTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -19,7 +19,6 @@ package com.arsdigita.domain; import com.arsdigita.persistence.DataObject; -import junit.framework.*; public class DomainObjectFactoryTest extends DomainTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java 2005-09-02 11:57:31 UTC (rev 746) @@ -23,7 +23,7 @@ import com.arsdigita.persistence.pdl.PDL; import java.util.HashSet; import java.util.Set; -import junit.framework.*; +import junit.framework.TestCase; /** * DomainTestCase: Provides a framework for domain test cases requiring the Modified: ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.*; +import junit.framework.TestCase; /** * ScriptTest Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -20,7 +20,6 @@ import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObject; -import junit.framework.*; /** * Test to illustrate a problem discovered with changing group Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -21,7 +21,9 @@ import java.security.GeneralSecurityException; import java.security.SecureRandom; import javax.crypto.Mac; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class CredentialTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/security/CryptoTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/security/CryptoTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/security/CryptoTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -20,8 +20,10 @@ import java.security.GeneralSecurityException; import java.security.SecureRandom; -import javax.crypto.*; -import junit.framework.*; +import javax.crypto.Mac; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class CryptoTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -21,8 +21,10 @@ import com.arsdigita.initializer.InitializationException; import java.util.Arrays; import java.util.List; -import javax.security.auth.login.*; -import junit.framework.*; +import javax.security.auth.login.AppConfigurationEntry; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; public class LoginConfigTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java 2005-09-02 11:02:24 UTC (rev 745) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java 2005-09-02 11:57:31 UTC (rev 746) @@ -18,12 +18,10 @@ */ package com.arsdigita.mail; -import javax.activation.*; -import javax.mail.*; -import javax.mail.internet.*; +import javax.activation.DataHandler; +import javax.mail.MessagingException; import junit.framework.TestCase; - /** * More Unit tests for ACS mail service. These tests probe * transmission of international and special characters in email. By |
From: <ssk...@vh...> - 2005-09-02 11:11:53
|
Author: sskracic Date: 2005-09-02 13:02:24 +0200 (Fri, 02 Sep 2005) New Revision: 745 Modified: ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java Log: NFC: yet more import cleanups. Modified: ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/EncodingTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,7 +19,6 @@ package com.arsdigita.util; import junit.framework.TestCase; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/GraphSetTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; - import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/GraphsTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; - import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HtmlToTextTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ */ package com.arsdigita.util; -import junit.framework.TestCase; import java.io.BufferedReader; import java.io.FileReader; +import junit.framework.TestCase; /** * Verify the HTML-to-text conversion class. This unit test uses a Modified: ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HttpDummySession.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,10 @@ */ package com.arsdigita.util; +import java.util.Enumeration; +import java.util.Hashtable; +import javax.servlet.ServletContext; import javax.servlet.http.HttpSessionContext; -import javax.servlet.ServletContext; -import java.util.Hashtable; -import java.util.Enumeration; public class HttpDummySession implements javax.servlet.http.HttpSession { Modified: ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,12 +19,6 @@ package com.arsdigita.util; import com.arsdigita.dispatcher.DispatcherHelper; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.io.UnsupportedEncodingException; import java.util.Enumeration; import java.util.HashMap; @@ -34,6 +28,11 @@ import java.util.Map; import java.util.Set; import java.util.Vector; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletInputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import org.apache.cactus.ServletURL; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyResponse.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,10 @@ */ package com.arsdigita.util; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; import java.io.PrintStream; import java.io.PrintWriter; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; public class HttpServletDummyResponse implements HttpServletResponse { Modified: ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/PriorityQueueTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,8 +18,8 @@ */ package com.arsdigita.util; +import java.util.NoSuchElementException; import junit.framework.TestCase; -import java.util.NoSuchElementException; public class PriorityQueueTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/StringUtilsTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,8 @@ */ package com.arsdigita.util; -import junit.framework.TestCase; - import java.util.HashMap; - +import junit.framework.TestCase; import org.apache.log4j.Logger; public class StringUtilsTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/TestServletContainer.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,13 +18,13 @@ */ package com.arsdigita.util; +import java.io.IOException; +import java.util.HashMap; +import java.util.StringTokenizer; +import javax.servlet.*; import org.apache.cactus.ServletURL; import org.apache.log4j.Logger; -import javax.servlet.*; -import java.io.IOException; -import java.util.HashMap; -import java.util.StringTokenizer; /* * Created by IntelliJ IDEA. * User: jorris Modified: ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/TreeTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; - import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/URLRewriterTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,12 +18,12 @@ */ package com.arsdigita.util; -import junit.framework.TestCase; -import java.util.Set; import java.util.HashSet; +import java.util.Iterator; import java.util.Map; -import java.util.Iterator; +import java.util.Set; import javax.servlet.http.HttpServletRequest; +import junit.framework.TestCase; public class URLRewriterTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,10 +18,9 @@ package com.arsdigita.util.url; -import junit.framework.TestCase; import com.arsdigita.util.StringUtils; - import java.util.Collection; +import junit.framework.TestCase; /** * URLCacheTest Modified: ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,14 +18,12 @@ package com.arsdigita.util.url; -import junit.framework.TestCase; - import java.io.FileInputStream; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.Reader; +import junit.framework.TestCase; - /** * URLPoolTest * Modified: ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ package com.arsdigita.util.url; -import com.arsdigita.tools.junit.framework.PackageTestSuite; import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; +import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; import org.apache.log4j.BasicConfigurator; Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/AdapterTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,12 +20,10 @@ import com.arsdigita.persistence.OID; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Timestamp; import java.util.Date; - import org.apache.log4j.Logger; public class AdapterTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/EventTypeTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -21,7 +21,6 @@ import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import com.arsdigita.tools.junit.framework.BaseTestCase; - import org.apache.log4j.Logger; public class EventTypeTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/IsolatedTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -25,9 +25,7 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TestTransaction; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigInteger; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/LoggingListener.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,7 +19,6 @@ package com.arsdigita.versioning; import com.arsdigita.persistence.OID; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/ObjectTypeMetadataTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,11 +18,9 @@ */ package com.arsdigita.versioning; -import com.redhat.persistence.pdl.VersioningMetadata; import com.arsdigita.versioning.ObjectTypeMetadata; - +import com.redhat.persistence.pdl.VersioningMetadata; import junit.framework.TestCase; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/QueueMapTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; - import junit.framework.TestCase; public class QueueMapTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/ReentranceTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TestTransaction; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigInteger; import java.util.ArrayList; import java.util.List; Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/TypesTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -21,9 +21,7 @@ import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigInteger; - import org.apache.log4j.Logger; public class TypesTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/Util.java 2005-09-02 11:02:24 UTC (rev 745) @@ -23,8 +23,6 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; - - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/VT4.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,12 +20,10 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.SessionManager; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; - /** * A wrapper for the "VT4" object type. * Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/VersioningEventProcessorTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -26,14 +26,12 @@ import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TestTransaction; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.Arrays; import java.util.Date; import java.util.HashSet; import java.util.Set; - import org.apache.log4j.Logger; public class VersioningEventProcessorTest extends BaseTestCase Modified: ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/versioning/XVersioningSuite.java 2005-09-02 11:02:24 UTC (rev 745) @@ -22,7 +22,6 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import com.arsdigita.util.Assert; - import junit.framework.Test; /** Modified: ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,18 +20,17 @@ import com.arsdigita.domain.DomainObject; import com.arsdigita.kernel.ACSObjectInstantiator; -import com.arsdigita.web.Application; -import com.arsdigita.web.ApplicationSetup; import com.arsdigita.kernel.security.UserContext; import com.arsdigita.persistence.DataObject; import com.arsdigita.util.DummyServletConfig; -import org.apache.log4j.Logger; - +import com.arsdigita.web.Application; +import com.arsdigita.web.ApplicationSetup; +import java.io.IOException; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; +import org.apache.log4j.Logger; /** * Tests Application dispatching Modified: ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,11 +18,11 @@ package com.arsdigita.web; +import java.io.IOException; +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; -import java.io.IOException; /** * Class DummyServlet Modified: ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/HostTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -21,7 +21,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.tools.junit.framework.BaseTestCase; - public class HostTest extends BaseTestCase { public static final String TEST_HOST1 = "test-app01.example.com"; Modified: ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/PathMapCacheTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -20,14 +20,12 @@ import com.arsdigita.web.PathMapCache.LongestMatch; import com.arsdigita.web.PathMapCache.LongestMatchException; - -import junit.framework.TestCase; - import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import junit.framework.TestCase; /** * @author Vadim Nasardinov (va...@re...) Modified: ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/TestApplication.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,9 +19,9 @@ package com.arsdigita.web; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.web.Application; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; +import com.arsdigita.web.Application; /* * Created by IntelliJ IDEA. Modified: ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/URLTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,15 +18,13 @@ */ package com.arsdigita.web; -import junit.framework.TestCase; - -import java.util.HashMap; -import java.util.Map; - import com.arsdigita.kernel.security.UserContext; import com.arsdigita.util.HttpServletDummyRequest; import com.arsdigita.util.HttpServletDummyResponse; import com.arsdigita.util.StringUtils; +import java.util.HashMap; +import java.util.Map; +import junit.framework.TestCase; /** * Created by IntelliJ IDEA. Modified: ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/WebSuite.java 2005-09-02 11:02:24 UTC (rev 745) @@ -17,16 +17,10 @@ * */ package com.arsdigita.web; -/* -* Created by IntelliJ IDEA. -* User: jorris -* Date: Oct 14, 2002 -* Time: 5:30:26 PM -* To change this template use Options | File Templates. -*/ -import com.arsdigita.tools.junit.framework.PackageTestSuite; + import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; +import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; public class WebSuite extends PackageTestSuite { Modified: ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,13 +19,12 @@ package com.arsdigita.web; import com.arsdigita.tools.junit.framework.BaseTestCase; -import com.arsdigita.util.TestServletContainer; -import com.arsdigita.util.HttpServletDummyRequest; -import com.arsdigita.util.HttpServletDummyResponse; import com.arsdigita.util.DummyServletConfig; import com.arsdigita.util.DummyServletContext; +import com.arsdigita.util.HttpServletDummyRequest; +import com.arsdigita.util.HttpServletDummyResponse; +import com.arsdigita.util.TestServletContainer; - public class WebTestCase extends BaseTestCase { DispatcherServlet m_dispatcher; Modified: ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java 2005-09-02 11:02:24 UTC (rev 745) @@ -19,11 +19,11 @@ package com.arsdigita.xml; import java.io.ByteArrayOutputStream; -import junit.framework.*; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.*; import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.*; import javax.xml.transform.stream.*; +import junit.framework.*; public class ACSJDOMTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,22 +18,21 @@ */ package com.arsdigita.xmlutil; -import org.jdom.JDOMException; -import org.jdom.Element; -import org.jdom.Document; -import org.jdom.output.XMLOutputter; -import org.jdom.input.SAXBuilder; -import org.jdom.input.JDOMFactory; -import org.apache.log4j.Logger; - -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import org.apache.log4j.Logger; +import org.jdom.Document; +import org.jdom.Element; +import org.jdom.JDOMException; +import org.jdom.input.JDOMFactory; +import org.jdom.input.SAXBuilder; +import org.jdom.output.XMLOutputter; public class DocImporter { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,12 +18,12 @@ */ package com.arsdigita.xmlutil; -import org.jdom.Namespace; +import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; -import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PartyCollection; -import com.arsdigita.kernel.Party; import com.arsdigita.util.UncheckedWrapperException; +import org.jdom.Namespace; public abstract class PermissionsAction extends TestAction { public PermissionsAction(String name) { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/ResourceRegistry.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ */ package com.arsdigita.xmlutil; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; -import java.util.LinkedList; -import java.util.Iterator; public class ResourceRegistry { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDefinition.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,18 +18,16 @@ */ package com.arsdigita.xmlutil; +import com.arsdigita.util.StringUtils; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import org.apache.log4j.Logger; +import org.jdom.Document; import org.jdom.Element; import org.jdom.Namespace; -import org.jdom.Document; import org.jdom.input.JDOMFactory; -import org.apache.log4j.Logger; -import java.util.List; -import java.util.Iterator; -import java.util.LinkedList; - -import com.arsdigita.util.StringUtils; - public class TestDefinition extends Element { private static Logger s_log = Logger.getLogger(TestDefinition.class); Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestDocument.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,9 +18,9 @@ */ package com.arsdigita.xmlutil; +import org.jdom.DocType; import org.jdom.Document; import org.jdom.Element; -import org.jdom.DocType; import org.jdom.input.JDOMFactory; /** Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestJDOMFactory.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,14 +18,13 @@ */ package com.arsdigita.xmlutil; -import org.jdom.input.DefaultJDOMFactory; -import org.jdom.*; -import org.apache.log4j.Logger; - -import java.util.Map; import java.util.HashMap; -import java.util.List; import java.util.Iterator; +import java.util.List; +import java.util.Map; +import org.apache.log4j.Logger; +import org.jdom.*; +import org.jdom.input.DefaultJDOMFactory; public abstract class TestJDOMFactory extends DefaultJDOMFactory { public TestJDOMFactory() throws JDOMException { Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/TestSet.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,17 +18,15 @@ */ package com.arsdigita.xmlutil; -import org.jdom.Namespace; -import org.jdom.Element; -import org.apache.log4j.Logger; - -import java.util.List; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.Iterator; import java.util.LinkedList; -import java.io.StringWriter; -import java.io.PrintWriter; +import java.util.List; +import org.apache.log4j.Logger; +import org.jdom.Element; +import org.jdom.Namespace; - public class TestSet extends Element { public static final String NAME = "test_set"; private static Logger s_log = Logger.getLogger(TestSet.class); Modified: ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java 2005-09-02 10:56:35 UTC (rev 744) +++ ccm-core/trunk/test/src/com/arsdigita/xmlutil/XMLException.java 2005-09-02 11:02:24 UTC (rev 745) @@ -18,8 +18,8 @@ */ package com.arsdigita.xmlutil; +import org.jdom.Element; import org.jdom.JDOMException; -import org.jdom.Element; import org.jdom.output.XMLOutputter; public class XMLException extends JDOMException { |
Author: sskracic Date: 2005-09-02 12:56:35 +0200 (Fri, 02 Sep 2005) New Revision: 744 Modified: ccm-core/trunk/test/src/com/arsdigita/search/NoopQueryEngine.java ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java ccm-core/trunk/test/src/com/arsdigita/search/ObserverTest.java ccm-core/trunk/test/src/com/arsdigita/search/RegistryTest.java ccm-core/trunk/test/src/com/arsdigita/search/TestDocument.java ccm-core/trunk/test/src/com/arsdigita/search/TestDocumentObserver.java ccm-core/trunk/test/src/com/arsdigita/search/TestQueryEngine.java ccm-core/trunk/test/src/com/arsdigita/search/TestResultSet.java ccm-core/trunk/test/src/com/arsdigita/search/TestSearchIndex.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java ccm-core/trunk/test/src/com/arsdigita/search/lucene/LuceneSuite.java ccm-core/trunk/test/src/com/arsdigita/search/lucene/OtherType.java ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java ccm-core/trunk/test/src/com/arsdigita/test/NoSuchLinkException.java ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/BaseTestSetup.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerfTiming.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceTestSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PermissionDecorator.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/MissingTests.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/NewTests.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultComparator.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultDiff.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultFileSetLoader.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultJDOMFactory.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/XMLResult.java ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java ccm-core/trunk/test/src/com/arsdigita/util/DummyServletConfig.java ccm-core/trunk/test/src/com/arsdigita/util/DummyServletContext.java Log: NFC: ... Modified: ccm-core/trunk/test/src/com/arsdigita/search/NoopQueryEngine.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/NoopQueryEngine.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/NoopQueryEngine.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,7 +18,6 @@ */ package com.arsdigita.search; - public class NoopQueryEngine implements QueryEngine { public ResultSet process(QuerySpecification spec) { Modified: ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,12 +18,11 @@ */ package com.arsdigita.search; -import com.arsdigita.domain.DomainObject; +import com.arsdigita.domain.DomainObject; import com.arsdigita.kernel.Party; import java.util.Date; import java.util.Locale; - public class NoteAdapter implements MetadataProvider { Modified: ccm-core/trunk/test/src/com/arsdigita/search/ObserverTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/ObserverTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/ObserverTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -21,7 +21,6 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; import org.apache.log4j.Logger; - public class ObserverTest extends BaseTestCase { private static Logger s_log = Modified: ccm-core/trunk/test/src/com/arsdigita/search/RegistryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/RegistryTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/RegistryTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,11 +18,10 @@ */ package com.arsdigita.search; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.tools.junit.framework.BaseTestCase; import org.apache.log4j.Logger; -import com.arsdigita.kernel.ACSObject; - public class RegistryTest extends BaseTestCase { private static Logger s_log = Modified: ccm-core/trunk/test/src/com/arsdigita/search/TestDocument.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/TestDocument.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/TestDocument.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,9 +18,9 @@ */ package com.arsdigita.search; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObject; import com.arsdigita.kernel.Party; +import com.arsdigita.persistence.OID; import com.arsdigita.util.Assert; import java.util.Date; import java.util.Locale; Modified: ccm-core/trunk/test/src/com/arsdigita/search/TestDocumentObserver.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/TestDocumentObserver.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/TestDocumentObserver.java 2005-09-02 10:56:35 UTC (rev 744) @@ -20,7 +20,6 @@ import com.arsdigita.domain.DomainObject; - public class TestDocumentObserver implements DocumentObserver { public void onSave(DomainObject dobj) { Modified: ccm-core/trunk/test/src/com/arsdigita/search/TestQueryEngine.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/TestQueryEngine.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/TestQueryEngine.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,7 +18,6 @@ */ package com.arsdigita.search; - public class TestQueryEngine implements QueryEngine { public ResultSet process(QuerySpecification spec) { Modified: ccm-core/trunk/test/src/com/arsdigita/search/TestResultSet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/TestResultSet.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/TestResultSet.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,9 +18,9 @@ */ package com.arsdigita.search; -import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; public class TestResultSet implements ResultSet { Modified: ccm-core/trunk/test/src/com/arsdigita/search/TestSearchIndex.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/TestSearchIndex.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/TestSearchIndex.java 2005-09-02 10:56:35 UTC (rev 744) @@ -21,18 +21,15 @@ import com.arsdigita.domain.DomainObject; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.metadata.ObjectType; - -import com.arsdigita.search.filters.ObjectTypeFilterType; import com.arsdigita.search.filters.ObjectTypeFilterSpecification; - -import java.util.Map; -import java.util.HashMap; -import java.util.List; +import com.arsdigita.search.filters.ObjectTypeFilterType; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; -import java.math.BigDecimal; - +import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java 2005-09-02 10:56:35 UTC (rev 744) @@ -19,15 +19,14 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataObject; import com.arsdigita.domain.DomainObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObjectInstantiator; - +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; import java.math.BigDecimal; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java 2005-09-02 10:56:35 UTC (rev 744) @@ -19,14 +19,13 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataObject; import com.arsdigita.domain.DomainObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObjectInstantiator; - +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; import java.math.BigDecimal; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/lucene/LuceneSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/lucene/LuceneSuite.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/lucene/LuceneSuite.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,13 +18,13 @@ */ package com.arsdigita.search.lucene; +import com.arsdigita.search.Search; import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import com.arsdigita.search.Search; import junit.framework.Test; +import junit.framework.TestResult; import junit.framework.TestSuite; -import junit.framework.TestResult; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/lucene/OtherType.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/lucene/OtherType.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/lucene/OtherType.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,10 +18,9 @@ */ package com.arsdigita.search.lucene; -import com.arsdigita.kernel.ACSObject; import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.persistence.OID; - import java.math.BigDecimal; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/search/lucene/SearchTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -20,12 +20,11 @@ import com.arsdigita.search.Search; import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.math.BigDecimal; import org.apache.log4j.Logger; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.index.IndexWriter; -import java.math.BigDecimal; - /** * SearchTest * Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,31 +18,25 @@ */ package com.arsdigita.sitenode; +import com.arsdigita.dispatcher.Dispatcher; +import com.arsdigita.dispatcher.RequestContext; +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.kernel.PackageInstance; +import com.arsdigita.kernel.PackageInstanceCollection; +import com.arsdigita.kernel.PackageType; +import com.arsdigita.kernel.SiteNode; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.sitenode.SiteNodeDispatcher; +import java.util.Enumeration; import javax.servlet.*; import javax.servlet.http.*; -import java.util.Enumeration; - import junit.framework.*; - import org.apache.cactus.*; import org.apache.cactus.util.*; - import org.apache.log4j.Logger; -import com.arsdigita.dispatcher.Dispatcher; -import com.arsdigita.dispatcher.RequestContext; -import com.arsdigita.sitenode.SiteNodeDispatcher; - -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.Session; -import com.arsdigita.persistence.TransactionContext; -import com.arsdigita.domain.DataObjectNotFoundException; - -import com.arsdigita.kernel.PackageInstanceCollection; -import com.arsdigita.kernel.PackageInstance; -import com.arsdigita.kernel.PackageType; -import com.arsdigita.kernel.SiteNode; - /** * This tests the instantiation of a particular package's dispatcher * to make sure it instantiated once. SDM Bug #801 Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,14 +18,12 @@ */ package com.arsdigita.sitenode; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; import junit.framework.*; - import org.apache.cactus.*; import org.apache.cactus.util.*; -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.Session; - public class PersistenceCactusTest extends ServletTestCase { public static final String versionId = "$Id$ by $Author$, $DateTime: 2004/08/16 18:10:38 $"; Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,25 +18,18 @@ */ package com.arsdigita.sitenode; +import com.arsdigita.dispatcher.RequestContext; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.sitenode.SiteNodeDispatcher; +import java.io.IOException; import javax.servlet.*; import javax.servlet.http.*; - -import java.io.IOException; - import junit.framework.*; - import org.apache.cactus.*; import org.apache.cactus.util.*; - import org.apache.log4j.Logger; -import com.arsdigita.dispatcher.RequestContext; -import com.arsdigita.sitenode.SiteNodeDispatcher; - -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.Session; - - public class SiteNodeDispatcherCactusTest extends ServletTestCase { public static final String versionId = "$Id$ by $Author$, $DateTime: 2004/08/16 18:10:38 $"; Modified: ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,8 +18,8 @@ */ package com.arsdigita.sitenode; +import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.*; -import com.arsdigita.tools.junit.framework.PackageTestSuite; public class SiteNodeSuite extends PackageTestSuite { Modified: ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/test/CoreHttpUnit.java 2005-09-02 10:56:35 UTC (rev 744) @@ -21,9 +21,7 @@ import com.arsdigita.kernel.EmailAddress; import com.arsdigita.util.UncheckedWrapperException; import com.meterware.httpunit.*; - import java.io.IOException; - import org.xml.sax.SAXException; /** Modified: ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java 2005-09-02 10:56:35 UTC (rev 744) @@ -20,9 +20,6 @@ import com.arsdigita.web.URL; import com.meterware.httpunit.*; - - - import junit.framework.*; /** Modified: ccm-core/trunk/test/src/com/arsdigita/test/NoSuchLinkException.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/test/NoSuchLinkException.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/test/NoSuchLinkException.java 2005-09-02 10:56:35 UTC (rev 744) @@ -19,7 +19,6 @@ package com.arsdigita.test; import com.meterware.httpunit.WebResponse; - import java.io.IOException; /** Modified: ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,9 +18,9 @@ */ package com.arsdigita.test.ddl; -import junit.framework.*; import java.io.IOException; import java.io.Reader; +import junit.framework.*; /** * DDLDiffTest Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/BaseTestSetup.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/BaseTestSetup.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/BaseTestSetup.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,29 +18,25 @@ */ package com.arsdigita.tools.junit.extensions; -import com.arsdigita.util.ResourceManager; import com.arsdigita.db.DbHelper; -import com.arsdigita.runtime.RuntimeConfig; - -import java.sql.Connection; -import java.io.File; - import com.arsdigita.installer.LoadSQLPlusScript; +import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.util.DummyServletContext; import com.arsdigita.util.ResourceManager; import com.arsdigita.util.jdbc.Connections; +import java.io.File; +import java.sql.Connection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; import junit.extensions.TestDecorator; import junit.framework.Protectable; import junit.framework.Test; import junit.framework.TestResult; import junit.framework.TestSuite; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.HashSet; -import java.util.Set; - /** * A Decorator to set up and tear down additional fixture state. * Subclass BaseTestSetup and insert it into your tests when you want Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java 2005-09-02 10:56:35 UTC (rev 744) @@ -19,11 +19,11 @@ package com.arsdigita.tools.junit.extensions; import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; -import com.arsdigita.persistence.pdl.ManifestSource; -import com.arsdigita.persistence.pdl.NameFilter; import com.arsdigita.util.SystemProperties; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.StringArrayParameter; Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/Initializer.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,20 +18,18 @@ */ package com.arsdigita.tools.junit.extensions; -import com.arsdigita.initializer.Startup; import com.arsdigita.initializer.InitializationException; +import com.arsdigita.initializer.Startup; import com.arsdigita.util.ResourceManager; - -import junit.extensions.*; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.Reader; import java.util.Collection; +import junit.extensions.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Initializer Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerfTiming.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerfTiming.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerfTiming.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,26 +18,24 @@ */ package com.arsdigita.tools.junit.extensions; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Date; +import java.util.Iterator; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import junit.framework.Test; import junit.framework.TestCase; +import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; import org.xml.sax.SAXException; -import org.apache.log4j.Logger; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Date; -import java.util.Iterator; - - /** * <P> This Utility class records and provides access to timing results and * other test information stored in an xml file. </P> Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceSuite.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceSuite.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,14 +18,11 @@ */ package com.arsdigita.tools.junit.extensions; -import com.arsdigita.tools.junit.extensions.TimedTestRecord; import com.arsdigita.tools.junit.extensions.PerfTiming; +import com.arsdigita.tools.junit.extensions.TimedTestRecord; import com.arsdigita.tools.junit.framework.PackageTestSuite; - import com.arsdigita.util.UncheckedWrapperException; - import java.io.File; - import junit.framework.Test; import junit.framework.TestCase; Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceTestSuite.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceTestSuite.java 2005-09-02 10:56:35 UTC (rev 744) @@ -20,8 +20,6 @@ import com.arsdigita.tools.junit.extensions.PerformanceSuite; - - public class PerformanceTestSuite extends PerformanceSuite { public PerformanceTestSuite () { Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PermissionDecorator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PermissionDecorator.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PermissionDecorator.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,15 +18,15 @@ */ package com.arsdigita.tools.junit.extensions; -import junit.extensions.TestDecorator; -import junit.framework.Test; -import junit.framework.TestResult; import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.kernel.User; import com.arsdigita.kernel.UserCollection; -import com.arsdigita.kernel.User; import com.arsdigita.kernel.permissions.PermissionService; +import com.arsdigita.kernel.permissions.PrivilegeDescriptor; import com.arsdigita.kernel.permissions.UniversalPermissionDescriptor; -import com.arsdigita.kernel.permissions.PrivilegeDescriptor; +import junit.extensions.TestDecorator; +import junit.framework.Test; +import junit.framework.TestResult; /** * Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,15 +18,13 @@ */ package com.arsdigita.tools.junit.extensions; +import com.arsdigita.categorization.CategoryTest; import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.TimedTestRecord; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import com.arsdigita.categorization.CategoryTest; - -import junit.framework.*; import com.clarkware.junitperf.*; +import junit.framework.*; - /** * <P>Example of {@link TimedTestRecord} usage </P> * Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestCaseDescriptor.java 2005-09-02 10:56:35 UTC (rev 744) @@ -22,7 +22,6 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.Map; - import junit.extensions.TestDecorator; import junit.framework.Test; Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,16 +18,15 @@ package com.arsdigita.tools.junit.extensions; -import com.arsdigita.runtime.Startup; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.Session; - +import com.arsdigita.runtime.Startup; import java.sql.Connection; import java.util.Collection; -import java.util.Set; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; -import java.util.Collections; +import java.util.Set; /** * TestStartup: Extends Startup to limit the required initializers when tests are run. Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TimedTestRecord.java 2005-09-02 10:56:35 UTC (rev 744) @@ -17,18 +17,16 @@ * */ package com.arsdigita.tools.junit.extensions; -import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.util.UncheckedWrapperException; import com.clarkware.junitperf.TimedTest; - import junit.extensions.TestDecorator; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestResult; import junit.framework.TestSuite; - /** * <P>This test decorator is used to decorate <code>TestCases</code> only. * It records how long the tests took to execute. If the test had been Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/BaseTestCase.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,14 +18,13 @@ */ package com.arsdigita.tools.junit.framework; -import junit.framework.*; +import com.arsdigita.kernel.TestHelper; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.kernel.TestHelper; +import java.util.Locale; +import junit.framework.*; import org.apache.log4j.Logger; -import java.util.Locale; - public abstract class BaseTestCase extends TestCase { private static Logger s_log = Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java 2005-09-02 10:56:35 UTC (rev 744) @@ -17,11 +17,12 @@ * */ package com.arsdigita.tools.junit.framework; -import junit.framework.*; + +import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.io.File; +import junit.framework.*; /** * PackageTestSuite Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/MissingTests.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/MissingTests.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/MissingTests.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,10 +18,9 @@ */ package com.arsdigita.tools.junit.results; -import org.jdom.Element; - import java.util.Iterator; import java.util.List; +import org.jdom.Element; public class MissingTests extends Element { public static final String NAME = "missing_tests"; Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/NewTests.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/NewTests.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/NewTests.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,10 +18,9 @@ */ package com.arsdigita.tools.junit.results; -import org.jdom.Element; - import java.util.Iterator; import java.util.List; +import org.jdom.Element; public class NewTests extends Element { public static final String NAME = "new_tests"; Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultComparator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultComparator.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultComparator.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,6 +18,17 @@ */ package com.arsdigita.tools.junit.results; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamSource; import org.jdom.Document; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; @@ -25,18 +36,6 @@ import org.jdom.transform.JDOMResult; import org.jdom.transform.JDOMSource; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamSource; -import java.io.FileWriter; -import java.io.IOException; -import java.io.FileOutputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; -import java.util.Arrays; - /** * ResultComparator * Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultDiff.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultDiff.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultDiff.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,10 +18,9 @@ */ package com.arsdigita.tools.junit.results; -import org.jdom.Element; - import java.util.Iterator; import java.util.List; +import org.jdom.Element; public final class ResultDiff extends Element { Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultFileSetLoader.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultFileSetLoader.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultFileSetLoader.java 2005-09-02 10:56:35 UTC (rev 744) @@ -19,16 +19,15 @@ package com.arsdigita.tools.junit.results; import com.arsdigita.util.UncheckedWrapperException; -import org.jdom.Document; -import org.jdom.JDOMException; -import org.jdom.input.SAXBuilder; -import org.apache.log4j.Logger; - import java.io.File; import java.io.FilenameFilter; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.log4j.Logger; +import org.jdom.Document; +import org.jdom.JDOMException; +import org.jdom.input.SAXBuilder; /** * ResultFileSetLoader Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultJDOMFactory.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultJDOMFactory.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/ResultJDOMFactory.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,8 +18,8 @@ */ package com.arsdigita.tools.junit.results; +import org.jdom.Element; import org.jdom.input.DefaultJDOMFactory; -import org.jdom.Element; /** * ResultJDOMFactory Modified: ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/XMLResult.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/XMLResult.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/tools/junit/results/XMLResult.java 2005-09-02 10:56:35 UTC (rev 744) @@ -17,12 +17,13 @@ * */ package com.arsdigita.tools.junit.results; -import org.jdom.Element; -import java.util.Map; import java.util.HashMap; +import java.util.Iterator; import java.util.List; -import java.util.Iterator; +import java.util.Map; +import org.jdom.Element; + public class XMLResult extends Element { protected XMLResult() { super("testsuite"); Modified: ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java 2005-09-02 10:56:35 UTC (rev 744) @@ -19,31 +19,22 @@ package com.arsdigita.ui.login; import com.arsdigita.db.Sequences; - - import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.User; import com.arsdigita.kernel.UserAuthentication; import com.arsdigita.kernel.security.UserContext; - -import com.arsdigita.ui.login.UserNewForm; -import com.arsdigita.ui.login.UserRegistrationForm; import com.arsdigita.persistence.PersistenceException; +import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TransactionContext; -import com.arsdigita.persistence.Session; - +import com.arsdigita.test.HttpUnitTestCase; +import com.arsdigita.ui.login.UserNewForm; +import com.arsdigita.ui.login.UserRegistrationForm; import com.arsdigita.web.Web; - +import com.meterware.httpunit.*; import java.math.BigDecimal; import java.sql.SQLException; - -// Test Related -import com.meterware.httpunit.*; -import com.arsdigita.test.HttpUnitTestCase; import junit.framework.*; - -// Logging Support. import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,11 +18,11 @@ */ package com.arsdigita.util; -import javax.servlet.http.*; +import com.arsdigita.dispatcher.RequestContext; import java.util.Locale; import java.util.ResourceBundle; import javax.servlet.*; -import com.arsdigita.dispatcher.RequestContext; +import javax.servlet.http.*; /** * Dummy RequestContext object for unit testing of form methods that Modified: ccm-core/trunk/test/src/com/arsdigita/util/DummyServletConfig.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/util/DummyServletConfig.java 2005-09-02 10:50:34 UTC (rev 743) +++ ccm-core/trunk/test/src/com/arsdigita/util/DummyServletConfig.java 2005-09-02 10:56:35 UTC (rev 744) @@ -18,12 +18,12 @@ package com.arsdigita.util; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import java.util.Enumeration; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; -import java.util.Iterator; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; /** * Class DummyServletConfig Modified: ccm-core/trunk/test/src/com/arsdigita/util/DummyServletContext.java .. |
Author: sskracic Date: 2005-09-02 12:50:34 +0200 (Fri, 02 Sep 2005) New Revision: 743 Modified: ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java Log: NFC: more and more import tidying up. Modified: ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,20 +18,12 @@ */ package com.arsdigita.notification; - - -// ACS Core +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.OID; - -import com.arsdigita.domain.DataObjectNotFoundException; - -// JUnit classes import com.arsdigita.tools.junit.framework.BaseTestCase; - - /** * Test of RequestManager * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,12 +18,9 @@ */ package com.arsdigita.persistence; - import java.math.BigInteger; - import junit.extensions.*; import junit.framework.*; - import org.apache.log4j.varia.DenyAllFilter; import org.apache.log4j.varia.StringMatchFilter; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.ObjectType; import junit.framework.*; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryImplTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,19 +18,17 @@ */ package com.arsdigita.persistence; -import java.util.HashMap; -import java.util.Map; -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; +import com.arsdigita.persistence.metadata.Utilities; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; - -import com.arsdigita.persistence.metadata.Utilities; - +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/DataQueryTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,9 +18,9 @@ */ package com.arsdigita.persistence; +import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; -import java.math.BigDecimal; /** * DataQueryTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/FilterTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataObjectTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,11 +18,11 @@ */ package com.arsdigita.persistence; +import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; import java.math.BigInteger; +import java.util.Iterator; import java.util.LinkedList; -import java.util.Iterator; -import com.arsdigita.persistence.metadata.ObjectType; /** * GenericDataObjectText Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/InitializerTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,7 +19,6 @@ package com.arsdigita.persistence; import com.arsdigita.persistence.metadata.MetadataRoot; - import junit.framework.TestCase; import junit.framework.TestSuite; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/LinkAttributeTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,10 +18,10 @@ */ package com.arsdigita.persistence; +import com.arsdigita.domain.DataObjectNotFoundException; import java.math.BigInteger; import java.util.Arrays; import org.apache.log4j.Logger; -import com.arsdigita.domain.DataObjectNotFoundException; /** * LinkAttributeTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,17 +18,15 @@ */ package com.arsdigita.persistence; +import com.arsdigita.db.DbHelper; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; -import com.arsdigita.db.DbHelper; - import java.io.Writer; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,16 +19,12 @@ package com.arsdigita.persistence; import com.arsdigita.logging.SecureLogFilter; - import java.io.StringWriter; -import java.io.StringWriter; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; - import junit.extensions.*; import junit.framework.*; - import org.apache.log4j.Category; import org.apache.log4j.Priority; import org.apache.log4j.TTCCLayout; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/MetaTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence; + import junit.framework.Test; import junit.framework.TestSuite; import org.apache.log4j.Level; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,8 +21,8 @@ import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; +import com.arsdigita.persistence.pdl.PDL; import com.arsdigita.persistence.pdl.PDLException; -import com.arsdigita.persistence.pdl.PDL; import java.io.StringReader; import junit.framework.TestCase; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,10 +20,9 @@ import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; - +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OIDTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,11 +18,10 @@ */ package com.arsdigita.persistence; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; +import junit.framework.TestCase; +import junit.framework.TestSuite; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/ObjectTypeValidator.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,16 +17,16 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.DataType; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; import com.arsdigita.util.Assert; +import java.util.Iterator; +import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.Priority; -import org.apache.log4j.Level; -import java.util.Iterator; - /** * ObjectTypeValidator * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,9 +18,9 @@ */ package com.arsdigita.persistence; +import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import java.math.BigInteger; /** * ObserverTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,10 +17,11 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; +import java.util.Date; import junit.framework.*; -import java.util.Date; /* This is a utiliy class for creating an Order and a DataAssociation set of * LineItems. Used internally by testing classes. Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/OrderTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,10 +19,9 @@ package com.arsdigita.persistence; import java.math.BigDecimal; - +import java.sql.SQLException; import java.util.HashSet; import java.util.Set; -import java.sql.SQLException; /** * Test Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PersistenceTestCase.java 2005-09-02 10:50:34 UTC (rev 743) @@ -23,16 +23,13 @@ import com.arsdigita.persistence.pdl.PDL; import com.arsdigita.persistence.pdl.PDLOutputter; import com.redhat.persistence.engine.rdbms.RDBMSEngine; -import junit.framework.TestCase; - -import java.util.HashSet; -import java.util.Set; import java.io.File; import java.io.InputStream; - +import java.util.HashSet; +import java.util.Set; +import junit.framework.TestCase; import org.apache.log4j.Logger; - /** * PersistenceTestCase * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,9 +20,6 @@ import com.arsdigita.util.UncheckedWrapperException; import com.mockobjects.sql.*; - -import junit.framework.TestCase; - import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; @@ -33,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import junit.framework.TestCase; /** * PooledConnectionSourceTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,11 +17,11 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; - +import java.util.Iterator; import junit.framework.*; -import java.util.Iterator; import org.apache.log4j.*; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,12 +18,9 @@ */ package com.arsdigita.persistence; - import java.math.BigInteger; - import junit.extensions.*; import junit.framework.*; - import org.apache.log4j.Logger; import org.apache.log4j.varia.DenyAllFilter; import org.apache.log4j.varia.StringMatchFilter; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence; - /** * LinkAttributeTest * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence; - /** * NodeTest * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/TransactionContextTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence; + import com.arsdigita.tools.junit.framework.BaseTestCase; /* Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -22,9 +22,8 @@ import com.redhat.persistence.metadata.Constraint; import com.redhat.persistence.metadata.Table; import com.redhat.persistence.metadata.UniqueKey; - -import junit.framework.*; import java.util.ArrayList; +import junit.framework.*; public class ConstraintTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java 2005-09-02 10:50:34 UTC (rev 743) @@ -17,6 +17,7 @@ * */ package com.arsdigita.persistence.metadata; + import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,8 +19,12 @@ package com.arsdigita.persistence.oql; import com.arsdigita.persistence.PersistenceTestCase; +import com.arsdigita.util.StringUtils; import com.redhat.persistence.Signature; import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; import com.redhat.persistence.oql.All; import com.redhat.persistence.oql.Define; import com.redhat.persistence.oql.Equals; @@ -31,17 +35,12 @@ import com.redhat.persistence.oql.Literal; import com.redhat.persistence.oql.Query; import com.redhat.persistence.oql.Variable; -import com.redhat.persistence.metadata.ObjectType; -import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.metadata.Table; -import com.arsdigita.util.StringUtils; -import org.apache.log4j.Logger; - +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; import java.io.Reader; import java.util.StringTokenizer; +import org.apache.log4j.Logger; /** * QueryTest Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -23,10 +23,7 @@ import com.redhat.persistence.metadata.Role; import com.redhat.persistence.metadata.Root; import com.redhat.persistence.pdl.PDL; -import com.redhat.persistence.pdl.PDL; - import java.io.FileReader; - import junit.framework.TestCase; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,8 +19,8 @@ package com.arsdigita.persistence.pdl; import java.io.File; +import java.util.ArrayList; import java.util.Arrays; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,16 +19,16 @@ package com.arsdigita.persistence.pdl; import com.arsdigita.persistence.metadata.MetadataRoot; -import junit.framework.TestCase; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.StringTokenizer; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.io.LineNumberReader; +import junit.framework.TestCase; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -22,7 +22,6 @@ import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; import com.arsdigita.tools.junit.framework.BaseTestCase; - import java.util.Iterator; /** Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,7 +18,6 @@ */ package com.arsdigita.persistence.tests.data; - import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; @@ -26,10 +25,8 @@ import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.util.Assert; - import org.apache.log4j.Logger; - /** * CRUDTestlet * Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java 2005-09-02 10:50:34 UTC (rev 743) @@ -24,23 +24,21 @@ import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; +import com.arsdigita.util.Assert; +import com.arsdigita.util.UncheckedWrapperException; import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.metadata.ObjectMap; import com.redhat.persistence.metadata.Column; import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.Root; import com.redhat.persistence.metadata.Value; -import com.arsdigita.util.Assert; -import com.arsdigita.util.UncheckedWrapperException; - -import org.apache.log4j.Logger; - import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Date; -import java.util.Iterator; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Date; +import java.util.Iterator; +import org.apache.log4j.Logger; /** * The DataSource class will provide an arbitrary number of pseudorandom test Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,8 +21,6 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; - - import org.apache.log4j.Logger; public class DoubleUpdateTestlet extends Testlet { Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/MappingsTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -20,7 +20,6 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; - /** * The MappingsTest class contains JUnit test cases for the various ways that * persistences supports mapping logical object hierarchy to a physical data Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,16 +18,14 @@ */ package com.arsdigita.persistence.tests.data; -import com.arsdigita.util.Assert; -import com.arsdigita.util.StringUtils; import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; - +import com.arsdigita.util.Assert; +import com.arsdigita.util.StringUtils; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.Map.Entry; import java.util.Map; import java.util.Set; Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,8 +21,6 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.metadata.ObjectType; - - import org.apache.log4j.Logger; public class PropertyIsolationTestlet extends Testlet { Modified: ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java 2005-09-02 10:50:34 UTC (rev 743) @@ -27,11 +27,9 @@ import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.persistence.metadata.Property; import com.arsdigita.util.Assert; - +import java.util.Iterator; import org.apache.log4j.Logger; -import java.util.Iterator; - /** * Testlet * Modified: ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/runtime/RuntimeSuite.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,12 +18,10 @@ */ package com.arsdigita.runtime; -// JUnit classes -import junit.framework.*; - import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; +import junit.framework.*; /** * RuntimeSuite Modified: ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/ConfigTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,7 +21,6 @@ import com.arsdigita.tools.junit.framework.BaseTestCase; import org.apache.log4j.Logger; - public class ConfigTest extends BaseTestCase { private static Logger s_log = Modified: ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/EngineTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -18,15 +18,13 @@ */ package com.arsdigita.search; +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.search.filters.ObjectTypeFilterSpecification; +import com.arsdigita.search.filters.ObjectTypeFilterType; import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.util.Iterator; import org.apache.log4j.Logger; -import com.arsdigita.search.filters.ObjectTypeFilterType; -import com.arsdigita.search.filters.ObjectTypeFilterSpecification; -import com.arsdigita.persistence.metadata.MetadataRoot; - -import java.util.Iterator; - public class EngineTest extends BaseTestCase { private static Logger s_log = Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java 2005-09-02 10:50:34 UTC (rev 743) @@ -21,21 +21,15 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.TransactionContext; import com.arsdigita.persistence.TestTransaction; - -import junit.framework.*; +import com.arsdigita.persistence.TransactionContext; +import java.math.BigDecimal; import java.util.Collection; import java.util.Iterator; import java.util.TreeSet; -import java.math.BigDecimal; - - - -// Support for Logging. +import junit.framework.*; import org.apache.log4j.Logger; - /** * Tests for SearchIndexHelpTest Class, used in search. * Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchSuite.java 2005-09-02 10:50:34 UTC (rev 743) @@ -23,8 +23,8 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; +import junit.framework.TestResult; import junit.framework.TestSuite; -import junit.framework.TestResult; /** * SearchSuite Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,16 +19,15 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataObject; import com.arsdigita.domain.DomainObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; - /** * SearchTestAuthor class. Used to test generating XML documents * for related objects. Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBook.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,15 +19,14 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObjectInstantiator; - +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; import java.math.BigDecimal; /** Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java 2005-09-02 10:43:19 UTC (rev 742) +++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java 2005-09-02 10:50:34 UTC (rev 743) @@ -19,15 +19,14 @@ package com.arsdigita.search.intermedia; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.OID; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectInstantiator; import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; - /** * SearchTestBookH class. Used to test generating XML documents * for related objects. |
From: <ssk...@vh...> - 2005-09-02 10:52:24
|
Author: sskracic Date: 2005-09-02 12:43:19 +0200 (Fri, 02 Sep 2005) New Revision: 742 Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java Log: NFC: more import tidying. Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -24,14 +24,13 @@ import com.arsdigita.persistence.OID; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.ObjectType; -import org.apache.log4j.Logger; - import com.arsdigita.tools.junit.framework.BaseTestCase; -import junit.framework.Test; -import junit.framework.TestSuite; import java.math.BigDecimal; import java.sql.SQLException; import java.util.HashSet; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.apache.log4j.Logger; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/GroupsBasicTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,24 +18,18 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; - -// Domain object support. +import com.arsdigita.db.Sequences; import com.arsdigita.domain.DomainCollection; import com.arsdigita.domain.DomainObject; - -// Persistence Support. -import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.OID; -import com.arsdigita.db.Sequences; +import com.arsdigita.persistence.PersistenceException; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; - -import java.util.Collection; import java.util.ArrayList; -import java.util.List; import java.util.Arrays; +import java.util.Collection; import java.util.Iterator; +import java.util.List; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/KernelSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,8 +19,8 @@ package com.arsdigita.kernel; import com.arsdigita.tools.junit.extensions.BaseTestSetup; +import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.extensions.PermissionDecorator; -import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,11 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; - -// Persistence Support. +import com.arsdigita.dispatcher.Dispatcher; import com.arsdigita.domain.DataObjectNotFoundException; - -// Logging Support. +import com.arsdigita.tools.junit.framework.BaseTestCase; import org.apache.log4j.Logger; -// dispatcher -import com.arsdigita.dispatcher.Dispatcher; - /** * Test cases for the PackageType class. * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/PartiesBasicTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,22 +18,18 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; -import junit.framework.Test; -import junit.framework.TestSuite; - -// Persistence Support. +import com.arsdigita.db.Sequences; +import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.OID; -import com.arsdigita.db.Sequences; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; +import junit.framework.Test; +import junit.framework.TestSuite; -import com.arsdigita.domain.DomainObjectFactory; - /** * Tests basic functionality of kernel classes * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,14 @@ */ package com.arsdigita.kernel; -import com.arsdigita.kernel.permissions.PrivilegeDescriptor; - import com.arsdigita.domain.DataObjectNotFoundException; - - +import com.arsdigita.kernel.permissions.PrivilegeDescriptor; import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.util.ArrayList; +import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import java.util.ArrayList; -import java.util.Iterator; - /** * Test that roles work well with the permissions system * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/RoleTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,15 @@ */ package com.arsdigita.kernel; -import com.arsdigita.domain.DataObjectNotFoundException; - import com.arsdigita.db.Sequences; +import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.Filter; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.math.BigDecimal; +import java.sql.SQLException; import junit.framework.Test; import junit.framework.TestSuite; -import java.math.BigDecimal; -import java.sql.SQLException; - /** * Basic unit tests on Roles * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/SiteNodeTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,13 @@ */ package com.arsdigita.kernel; -// JUnit Support. -import com.arsdigita.tools.junit.framework.BaseTestCase; - -// Persistence Support. import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.math.BigDecimal; - -// Logging Support. import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,16 +18,14 @@ */ package com.arsdigita.kernel; - -import com.arsdigita.tools.junit.framework.BaseTestCase; -import org.apache.log4j.Logger; -import java.util.Set; -import java.util.HashSet; - +import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.Session; import com.arsdigita.persistence.pdl.PDL; +import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.util.HashSet; +import java.util.Set; +import org.apache.log4j.Logger; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,21 +18,15 @@ */ package com.arsdigita.kernel; +import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; - - -import com.arsdigita.domain.DataObjectNotFoundException; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.math.BigDecimal; import junit.framework.Test; import junit.framework.TestSuite; -import java.math.BigDecimal; - -// Logging Support. - /** * Tests basic functionality of the UserAuthentication class * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,13 +19,11 @@ package com.arsdigita.kernel; import com.arsdigita.db.Sequences; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.sql.SQLException; import junit.framework.Test; import junit.framework.TestSuite; -import java.sql.SQLException; - /** * Tests basic functionality of the UserAuthentication class * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserMassTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,13 +19,11 @@ package com.arsdigita.kernel; import com.arsdigita.db.Sequences; - import com.arsdigita.tools.junit.framework.BaseTestCase; +import java.sql.SQLException; import junit.framework.Test; import junit.framework.TestSuite; -import java.sql.SQLException; - /** * Tests that we can create and modify lots of users without running * out of memory. Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,29 +18,28 @@ */ package com.arsdigita.kernel; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.Session; -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.metadata.ObjectType; +import com.arsdigita.db.Sequences; import com.arsdigita.kernel.EmailAddress; -import com.arsdigita.kernel.GroupCollection; import com.arsdigita.kernel.Group; +import com.arsdigita.kernel.GroupCollection; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PersonName; -import com.arsdigita.kernel.UserCollection; import com.arsdigita.kernel.User; -import com.arsdigita.db.Sequences; -import org.apache.log4j.Logger; - +import com.arsdigita.kernel.UserCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.metadata.ObjectType; import com.arsdigita.tools.junit.framework.BaseTestCase; -import junit.framework.Test; -import junit.framework.TestSuite; import java.sql.SQLException; -import java.util.List; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.apache.log4j.Logger; /** * Tests basic functionality of kernel classes Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -21,23 +21,22 @@ import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.Group; -import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.User; -import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; +import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.UncheckedWrapperException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.log4j.Logger; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Tests that the permissioning service works correctly regardless of the * ordering of particular actions (such as granting to a group, adding a Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -20,31 +20,25 @@ import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.Group; -import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.kernel.GroupTest; import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.PartyCollection; -import com.arsdigita.kernel.User; import com.arsdigita.kernel.RoleTest; -import com.arsdigita.kernel.GroupTest; - - - -import com.arsdigita.persistence.PersistenceException; -import com.arsdigita.persistence.OID; +import com.arsdigita.kernel.User; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; - - import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.UncheckedWrapperException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import java.util.HashSet; -import java.util.Collection; -import java.util.Iterator; - /** * Tests basic functionality of the PermissionService class * Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -21,7 +21,6 @@ import java.security.GeneralSecurityException; import java.security.SecureRandom; import javax.crypto.Mac; - import junit.framework.*; public class CredentialTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -19,7 +19,6 @@ package com.arsdigita.kernel.security; import com.arsdigita.initializer.InitializationException; - import java.util.Arrays; import java.util.List; import javax.security.auth.login.*; Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailCharTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - -// Java Core classes -import javax.mail.*; import javax.activation.*; +import javax.mail.*; import javax.mail.internet.*; +import junit.framework.TestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailFailTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,11 +18,8 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - import javax.mail.*; - +import junit.framework.TestCase; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - -// Java Core classes -import javax.mail.*; import javax.activation.*; +import javax.mail.*; import javax.mail.internet.*; +import junit.framework.TestCase; /** * Unit tests for the ACS Mail service MailQueue class. Currently Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.*; - -// aD extensions import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; +import junit.framework.*; /** * MailSuite Modified: ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,16 +18,13 @@ */ package com.arsdigita.mail; -// JUnit classes -import junit.framework.TestCase; - -// Java Core classes +import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import java.io.File; -import javax.mail.*; import javax.activation.*; +import javax.mail.*; import javax.mail.internet.*; +import junit.framework.TestCase; /** * Unit tests for the ACS Mail service. Note that these tests only Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/AttachmentTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,10 +18,10 @@ */ package com.arsdigita.messaging; +import com.arsdigita.domain.DataObjectNotFoundException; +import java.io.File; import java.util.Iterator; -import java.io.File; import javax.activation.DataHandler; -import com.arsdigita.domain.DataObjectNotFoundException; /** * Test cases for attachments. Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MailMessageTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,8 @@ */ package com.arsdigita.messaging; -// ACS Mail import com.arsdigita.mail.Mail; import com.arsdigita.mail.SimpleServer; - -// ACS Core - -// Java import java.util.Iterator; /** Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessagePartTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,7 +18,6 @@ */ package com.arsdigita.messaging; -// Java core classes import java.net.URL; import javax.activation.*; Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessageSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,14 +18,11 @@ */ package com.arsdigita.messaging; -// JUnit classes -import junit.framework.*; - -// aD extensions import com.arsdigita.tools.junit.extensions.BaseTestSetup; -import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.extensions.CoreTestSetup; +import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.framework.PackageTestSuite; +import junit.framework.*; /** * Messaging test suite. Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/MessageTestCase.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,13 +18,10 @@ */ package com.arsdigita.messaging; -// ACS core -import com.arsdigita.kernel.Party; -import com.arsdigita.kernel.User; import com.arsdigita.kernel.EmailAddress; +import com.arsdigita.kernel.Party; import com.arsdigita.kernel.PersonName; - -// JUnit classes +import com.arsdigita.kernel.User; import com.arsdigita.tools.junit.framework.BaseTestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/SortKeyTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,7 +18,6 @@ */ package com.arsdigita.messaging; -// JUnit classes import com.arsdigita.tools.junit.framework.BaseTestCase; /** Modified: ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/messaging/ThreadTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -22,8 +22,8 @@ import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.User; +import com.arsdigita.tools.junit.framework.BaseTestCase; import java.util.Date; -import com.arsdigita.tools.junit.framework.BaseTestCase; public class ThreadTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicAssociationTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,24 +18,24 @@ */ package com.arsdigita.metadata; -import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.JoinThrough; -import com.arsdigita.persistence.metadata.ObjectType; -import com.arsdigita.persistence.metadata.Property; -import com.arsdigita.persistence.metadata.Association; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.DataAssociation; import com.arsdigita.persistence.DataAssociationCursor; +import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.PersistenceException; -import java.util.List; +import com.arsdigita.persistence.metadata.Association; +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.persistence.metadata.ObjectType; +import com.arsdigita.persistence.metadata.Property; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.JoinThrough; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Iterator; -import java.math.BigDecimal; +import java.util.List; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/DynamicObjectTypeTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,33 +18,33 @@ */ package com.arsdigita.metadata; -import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.metadata.JoinThrough; -import com.redhat.persistence.metadata.Table; -import com.redhat.persistence.metadata.Column; -import com.redhat.persistence.metadata.ObjectMap; -import com.redhat.persistence.metadata.Mapping; -import com.redhat.persistence.metadata.Value; -import com.arsdigita.persistence.metadata.CompoundType; -import com.arsdigita.persistence.metadata.ObjectType; -import com.arsdigita.persistence.metadata.Property; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.metadata.Utilities; -import com.arsdigita.persistence.metadata.Model; -import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.DataAssociation; import com.arsdigita.persistence.DataAssociationCursor; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.DataOperation; import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.PersistenceException; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.PersistenceException; +import com.arsdigita.persistence.metadata.CompoundType; +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.persistence.metadata.Model; +import com.arsdigita.persistence.metadata.ObjectType; +import com.arsdigita.persistence.metadata.Property; +import com.arsdigita.persistence.metadata.Utilities; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.Value; +import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Iterator; import java.util.Collection; import java.util.Date; -import java.math.BigDecimal; +import java.util.Iterator; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/MetadataSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -17,6 +17,7 @@ * */ package com.arsdigita.metadata; + import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; Modified: ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,14 +18,13 @@ */ package com.arsdigita.metadata; -import com.arsdigita.persistence.metadata.MetadataRoot; -import com.arsdigita.persistence.pdl.PDL; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import junit.framework.*; - +import com.arsdigita.persistence.metadata.MetadataRoot; +import com.arsdigita.persistence.pdl.PDL; import java.util.HashSet; import java.util.Set; +import junit.framework.*; /** * PersistenceTestCase Modified: ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,27 +18,24 @@ */ package com.arsdigita.mimetypes; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.Session; +import com.arsdigita.db.DbHelper; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.mimetypes.converters.ConvertFormat; -import com.arsdigita.mimetypes.converters.PreConvertHTML; import com.arsdigita.mimetypes.converters.PostConvertHTML; - +import com.arsdigita.mimetypes.converters.PreConvertHTML; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.Session; import com.arsdigita.tools.junit.framework.BaseTestCase; -import java.math.BigDecimal; -import java.lang.Process; -import java.lang.Runtime; +import com.arsdigita.util.StringUtils; import java.io.BufferedReader; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; +import java.lang.Process; +import java.lang.Runtime; +import java.math.BigDecimal; -import com.arsdigita.util.StringUtils; -import com.arsdigita.db.DbHelper; - - /** * Test interMedia INSO filter converting of documents * to html. Modified: ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,18 +18,12 @@ */ package com.arsdigita.notification; -// ACS Core import com.arsdigita.kernel.User; +import com.arsdigita.mail.SimpleServer; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; - -// JUnit classes import com.arsdigita.tools.junit.framework.BaseTestCase; -// ACS mail -import com.arsdigita.mail.SimpleServer; - - /** * Test of DigestQueueManager, similar to SimpleQueueManagerTest. * Modified: ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/notification/ManagerDispatcher.java 2005-09-02 10:43:19 UTC (rev 742) @@ -18,10 +18,9 @@ */ package com.arsdigita.notification; -import java.util.TimerTask; import java.util.Date; +import java.util.TimerTask; - /** * This class serves as a container for a TimerTask that can be * dispatched at any time. After creation, the first run is invoked Modified: ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java 2005-09-02 10:37:02 UTC (rev 741) +++ ccm-core/trunk/test/src/com/arsdigita/notification/NotificationSuite.java 2005-09-02 10:43:19 UTC (rev 742) @@ -30,13 +30,11 @@ import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import junit.framework.Test; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.ListIterator; +import junit.framework.Test; - /** * Test Suite for Notifiction. Besides the standard jobs of the TestSuite file, this * class provides factory methods for <code>User</code>, <code>Notification</code>, |