Menu
▾
▴
[Aplaws-commit] r756 - ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz ccm-ldn-rss/trunk/src/com/arsdigita/london/rss ccm-ldn-search/trunk/src/com/arsdigita/london/search ccm-ldn-theme/trunk/src/com/arsdigita/london/theme ccm-ldn-util/trunk/src/com/arsdigita/london/util
|
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); - + } - + } |
