Menu
▾
▴
[Aplaws-commit] r734 - in ccm-core/trunk/src/com/arsdigita: categorization core developersupport initializer installer kernel mail mimetypes/image packaging persistence runtime search/converter util/protocol/resource
Author: sskracic Date: 2005-09-01 12:46:05 +0200 (Thu, 01 Sep 2005) New Revision: 734 Modified: ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java ccm-core/trunk/src/com/arsdigita/core/DBCheck.java ccm-core/trunk/src/com/arsdigita/core/LibCheck.java ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java ccm-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java ccm-core/trunk/src/com/arsdigita/mail/Mail.java ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java ccm-core/trunk/src/com/arsdigita/packaging/Check.java ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java ccm-core/trunk/src/com/arsdigita/packaging/Clear.java ccm-core/trunk/src/com/arsdigita/packaging/Command.java ccm-core/trunk/src/com/arsdigita/packaging/Config.java ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java ccm-core/trunk/src/com/arsdigita/packaging/Files.java ccm-core/trunk/src/com/arsdigita/packaging/Get.java ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java ccm-core/trunk/src/com/arsdigita/packaging/Load.java ccm-core/trunk/src/com/arsdigita/packaging/Loader.java ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java ccm-core/trunk/src/com/arsdigita/packaging/Menu.java ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java ccm-core/trunk/src/com/arsdigita/packaging/Set.java ccm-core/trunk/src/com/arsdigita/packaging/Status.java ccm-core/trunk/src/com/arsdigita/packaging/Unload.java ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java ccm-core/trunk/src/com/arsdigita/packaging/Which.java ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java Log: NFC: getting rid of wildcard imports in com.arsdigita source tree. Modified: ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.categorization; -import com.arsdigita.kernel.*; +import com.arsdigita.kernel.ACSObject; /** * Modified: ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,13 +19,18 @@ package com.arsdigita.core; import com.arsdigita.packaging.Check; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; +import com.arsdigita.util.Assert; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; -import java.net.*; -import java.io.*; -import java.util.*; - /** * BaseCheck * Modified: ccm-core/trunk/src/com/arsdigita/core/DBCheck.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/DBCheck.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/DBCheck.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,13 +19,12 @@ package com.arsdigita.core; import com.arsdigita.db.DbHelper; -import com.arsdigita.packaging.*; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; +import com.arsdigita.packaging.ConfigRegistry; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.util.jdbc.Connections; +import java.sql.Connection; -import java.sql.*; - /** * DBCheck * Modified: ccm-core/trunk/src/com/arsdigita/core/LibCheck.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/LibCheck.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/LibCheck.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.core; -import com.arsdigita.runtime.*; +import com.arsdigita.runtime.ScriptContext; /** * LibCheck Modified: ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,17 +19,24 @@ package com.arsdigita.core; import com.arsdigita.db.DbHelper; -import com.arsdigita.initializer.*; +import com.arsdigita.initializer.Configuration; import com.arsdigita.initializer.Initializer; -import com.arsdigita.packaging.*; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.servlet.*; -import java.io.*; -import java.util.*; +import com.arsdigita.initializer.Script; +import com.arsdigita.packaging.Config; +import com.arsdigita.packaging.ConfigRegistry; +import com.arsdigita.packaging.RegistryConfig; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterContext; +import com.arsdigita.util.servlet.HttpHost; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +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-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,11 +18,12 @@ */ package com.arsdigita.developersupport; -import com.redhat.persistence.engine.rdbms.*; +import com.redhat.persistence.engine.rdbms.RDBMSProfiler; +import com.redhat.persistence.engine.rdbms.RDBMSStatement; +import com.redhat.persistence.engine.rdbms.StatementLifecycle; +import java.sql.SQLException; +import java.util.HashMap; -import java.sql.*; -import java.util.*; - /** * DeveloperSupportProfiler * Modified: ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj =================================================================== --- ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj 2005-09-01 10:46:05 UTC (rev 734) @@ -7,9 +7,11 @@ package com.arsdigita.initializer; -import com.arsdigita.util.*; -import java.lang.reflect.*; -import java.util.*; +import com.arsdigita.util.Classes; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; /** * ScriptParser.java Modified: ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj =================================================================== --- ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj 2005-09-01 10:46:05 UTC (rev 734) @@ -8,7 +8,7 @@ package com.arsdigita.installer; -import java.io.*; +import java.io.Reader; class StatementParser { Modified: ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,9 +18,10 @@ */ package com.arsdigita.kernel; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.runtime.AbstractConfig; +import com.arsdigita.util.parameter.BooleanParameter; +import com.arsdigita.util.parameter.EnumerationParameter; +import com.arsdigita.util.parameter.Parameter; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/mail/Mail.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mail/Mail.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mail/Mail.java 2005-09-01 10:46:05 UTC (rev 734) @@ -35,7 +35,11 @@ import javax.activation.DataHandler; import javax.activation.FileDataSource; import javax.activation.URLDataSource; -import javax.mail.*; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.SendFailedException; +import javax.mail.Session; +import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMultipart; Modified: ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.mimetypes.image; -import java.awt.*; +import java.awt.Dimension; import java.io.DataInputStream; import java.io.IOException; Modified: ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.mimetypes.image; -import java.awt.*; +import java.awt.Dimension; import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; Modified: ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java 2005-09-01 10:46:05 UTC (rev 734) @@ -20,7 +20,7 @@ import com.arsdigita.mimetypes.util.GlobalizationUtil; -import java.awt.*; +import java.awt.Dimension; import java.io.DataInputStream; import java.io.IOException; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/arsdigita/packaging/Check.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Check.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Check.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.packaging; -import com.arsdigita.runtime.*; +import com.arsdigita.runtime.AbstractScript; /** * The Check class provides a developer callback for performing Modified: ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,17 +18,18 @@ */ package com.arsdigita.packaging; -import com.arsdigita.persistence.*; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; - +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.util.Classes; +import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.XML; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; -import java.io.*; -import java.util.*; - /** * Checklist * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Clear.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Clear.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Clear.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.*; +import com.arsdigita.util.parameter.Parameter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.util.*; - -import org.apache.commons.cli.*; - /** * Clear * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Command.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Command.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Command.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,10 +18,12 @@ */ package com.arsdigita.packaging; -import java.io.*; +import java.io.PrintStream; +import java.io.PrintWriter; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; -import org.apache.commons.cli.*; - /** * Command * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Config.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Config.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Config.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,12 +19,20 @@ package com.arsdigita.packaging; import com.arsdigita.runtime.CCM; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.util.Classes; +import com.arsdigita.util.JavaPropertyWriter; +import com.arsdigita.util.parameter.ErrorList; +import com.arsdigita.util.parameter.ParameterContext; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; -import java.io.*; -import java.util.*; - /** * Config * Modified: ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java 2005-09-01 10:46:05 UTC (rev 734) @@ -26,11 +26,8 @@ import com.arsdigita.util.parameter.ParameterContext; import com.arsdigita.util.parameter.ParameterReader; import com.arsdigita.xml.XML; - -import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -39,7 +36,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; - import org.apache.log4j.Logger; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; Modified: ccm-core/trunk/src/com/arsdigita/packaging/Files.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Files.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Files.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,8 @@ */ package com.arsdigita.packaging; -import java.io.*; +import java.io.File; +import java.io.IOException; /** * Commonly used file utilities. Modified: ccm-core/trunk/src/com/arsdigita/packaging/Get.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Get.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Get.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,25 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.*; +import com.arsdigita.util.JavaPropertyWriter; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterWriter; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.OptionGroup; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.util.*; - -import org.apache.commons.cli.*; - /** * Get * Modified: ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java 2005-09-01 10:46:05 UTC (rev 734) @@ -20,7 +20,6 @@ import com.arsdigita.util.Files; import com.arsdigita.util.StringUtils; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -30,8 +29,11 @@ import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; - -import org.apache.commons.cli.*; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/packaging/Load.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Load.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Load.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,36 +19,50 @@ package com.arsdigita.packaging; import com.arsdigita.core.DBCheck; -import com.arsdigita.db.DbHelper; import com.arsdigita.loader.PackageLoader; import com.arsdigita.persistence.ConnectionSource; import com.arsdigita.persistence.DedicatedConnectionSource; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.TransactionContext; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.pdl.PDLCompiler; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; +import com.arsdigita.runtime.InteractiveParameterLoader; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.runtime.Startup; +import com.arsdigita.util.JavaPropertyReader; +import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.config.JavaPropertyLoader; import com.arsdigita.util.jdbc.Connections; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.KernelExcursion; -import com.arsdigita.kernel.Kernel; +import com.arsdigita.util.parameter.CompoundParameterLoader; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterContext; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.PosixParser; -import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.*; -import java.util.Set; - /** * PackageTool * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Loader.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Loader.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Loader.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,22 +18,31 @@ */ package com.arsdigita.packaging; -import com.arsdigita.db.*; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.kernel.*; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.runtime.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.loader.PackageLoader; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.Initializer; -import com.arsdigita.loader.*; - -import java.io.*; -import java.sql.*; -import java.util.*; +import com.arsdigita.runtime.Script; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.runtime.Startup; +import com.arsdigita.util.Classes; +import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.util.parameter.ParameterLoader; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Connection; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; import java.util.Set; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,12 +18,13 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import java.util.*; -import java.io.*; - -import org.apache.commons.cli.*; - +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/packaging/Menu.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Menu.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Menu.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,11 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import java.io.*; -import java.util.*; - /** * Menu * Modified: ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,12 +18,27 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.util.parameter.ErrorList; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterError; +import com.arsdigita.util.parameter.ParameterInfo; +import com.arsdigita.util.parameter.ParameterReader; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; -import java.io.*; -import java.util.*; - /** * ParameterEditor * Modified: ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,12 +18,19 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.util.parameter.ErrorList; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterContext; +import com.arsdigita.util.parameter.ParameterReader; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import java.io.*; -import java.util.*; - /** * ParameterMap * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Set.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Set.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Set.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.*; +import com.arsdigita.util.JavaPropertyReader; +import java.io.IOException; +import java.util.Iterator; +import java.util.Properties; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.util.*; - -import org.apache.commons.cli.*; - /** * Set * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Status.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Status.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Status.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,8 +18,10 @@ */ package com.arsdigita.packaging; -import com.arsdigita.persistence.*; -import com.arsdigita.runtime.*; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.runtime.Startup; /** * Status Modified: ccm-core/trunk/src/com/arsdigita/packaging/Unload.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Unload.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Unload.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,12 +19,16 @@ package com.arsdigita.packaging; import com.arsdigita.runtime.CCM; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileFilter; +import java.util.HashSet; import java.util.Set; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import org.apache.commons.cli.*; - /** * Unload * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,16 +18,29 @@ */ package com.arsdigita.packaging; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.runtime.SchemaLoader; +import com.arsdigita.util.Assert; +import com.arsdigita.util.Classes; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.util.jdbc.Connections; import com.arsdigita.xml.XML; -import java.io.*; -import java.lang.reflect.*; -import java.sql.*; -import java.util.*; -import org.apache.commons.cli.*; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.MissingOptionException; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; Modified: ccm-core/trunk/src/com/arsdigita/packaging/Which.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Which.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Which.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,10 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import java.util.*; -import java.io.*; -import org.apache.commons.cli.*; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,8 +18,8 @@ */ package com.arsdigita.persistence; -import com.arsdigita.util.jdbc.*; -import java.sql.*; +import com.arsdigita.util.jdbc.Connections; +import java.sql.Connection; /** * DedicatedConnectionSource Modified: ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java 2005-09-01 10:46:05 UTC (rev 734) @@ -20,10 +20,15 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.jdbc.Connections; - -import java.sql.*; -import java.util.*; - +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,10 @@ */ package com.arsdigita.runtime; -import com.arsdigita.db.*; -import com.arsdigita.installer.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import java.io.*; -import java.sql.*; -import java.util.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.installer.SQLLoader; +import com.arsdigita.util.StringUtils; +import java.sql.Connection; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,15 +19,17 @@ package com.arsdigita.search.converter; import com.arsdigita.mimetypes.MimeType; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileInputStream; -import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; -import java.io.IOException; -import org.apache.poi.poifs.filesystem.*; -import org.apache.poi.hssf.record.*; -import org.apache.poi.hssf.eventusermodel.*; +import org.apache.poi.hssf.eventusermodel.HSSFEventFactory; +import org.apache.poi.hssf.eventusermodel.HSSFListener; +import org.apache.poi.hssf.eventusermodel.HSSFRequest; +import org.apache.poi.hssf.record.BOFRecord; +import org.apache.poi.hssf.record.LabelSSTRecord; +import org.apache.poi.hssf.record.NumberRecord; +import org.apache.poi.hssf.record.Record; +import org.apache.poi.hssf.record.SSTRecord; +import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,8 +18,12 @@ */ package com.arsdigita.util.protocol.resource; -import java.net.*; -import java.io.*; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; /** * Handler |
