ant-dev mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	dona...@apache.org
Subject	cvs commit: jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp JakartaOroRegexp.java JakartaRegexpRegexp.java Jdk14RegexpRegexp.java RegexpFactory.java RegexpMatcherFactory.java
Date	Fri, 05 Jul 2002 03:22:02 GMT
donaldp 2002/07/04 20:22:02 Modified: ant1compat/src/java/org/apache/tools/ant Ant1CompatProject.java Ant1CompatTargetTask.java Ant1CompatTaskAdapter.java Ant1CompatTypeInstanceTask.java BuildException.java LoaderUtils.java OriginalAnt1Task.java ant1compat/src/java/org/apache/tools/ant/types Path.java ant1compat/src/test/org/apache/tools/ant/test Ant1CompatTestCase.java antlib/src/java/org/apache/antlib/archive BUnzip2.java antlib/src/java/org/apache/antlib/build Patch.java UpToDateCondition.java antlib/src/java/org/apache/antlib/core AbstractAvailableCondition.java ExtFileNameMapper.java IsInstanceCondition.java LoadDOMTask.java LoadPropertyResourceTask.java PrefixFileNameMapper.java antlib/src/java/org/apache/antlib/cvslib ChangeLog.java Cvs.java CvsUser.java antlib/src/java/org/apache/antlib/dotnet CSharp.java Ilasm.java antlib/src/java/org/apache/antlib/file CopyTask.java antlib/src/java/org/apache/antlib/java ExternalCompilerAdaptor.java JavaCompilerAdaptor.java JavaTask.java JavacAdaptor.java JavacTask.java JikesAdaptor.java antlib/src/java/org/apache/antlib/nativelib Exec.java antlib/src/java/org/apache/antlib/project AbstractAntTask.java AntTask.java ProjectRefTask.java antlib/src/java/org/apache/antlib/runtime AbstractLibraryClassPath.java ConverterDef.java RootLibraryClassPath.java TypeLibAvailableCondition.java TypeLibTask.java antlib/src/java/org/apache/antlib/security GenerateKey.java SignJar.java antlib/src/java/org/apache/antlib/sound SoundTask.java antlib/src/java/org/apache/antlib/template AttributeAdapter.java TemplateDefTask.java TemplateTaskFactory.java antlib/src/java/org/apache/antlib/vfile CopyFilesTask.java ListFileSetTask.java MappedFileSet.java antlib/src/java/org/apache/antlib/xml XMLValidateTask.java XSLTProcess.java antlib/src/test/org/apache/antlib/core/test AbstractLoadPropertiesTaskTestCase.java IfTestCase.java IncludeTaskTestCase.java LoadDOMTaskTestCase.java PropertyTestCase.java antlib/src/test/org/apache/antlib/project/test AntCallTaskTestCase.java AntTaskTestCase.java ProjectRefTaskTestCase.java antlib/src/test/org/apache/antlib/runtime/test AbstractTypeDefTestCase.java TypeAvailableConditionTestCase.java TypeDefTestFileList.java aut/src/java/org/apache/aut/nativelib OsFamily.java aut/src/java/org/apache/aut/vfs FileObject.java aut/src/java/org/apache/aut/vfs/impl DefaultFileSystemManager.java DefaultProviderContext.java URLStreamHandlerProxy.java aut/src/java/org/apache/aut/vfs/provider AbstractFileObject.java DefaultURLConnection.java DefaultURLStreamHandler.java aut/src/java/org/apache/aut/vfs/provider/smb SmbFileSystemProvider.java aut/src/java/org/apache/aut/vfs/provider/zip ZipFileSystemProvider.java aut/src/test/org/apache/aut AbstractAutTestCase.java aut/src/test/org/apache/aut/vfs/provider/ftp/test FtpFileSystemTestCase.java aut/src/test/org/apache/aut/vfs/provider/local/test LocalFileSystemTestCase.java aut/src/test/org/apache/aut/vfs/provider/smb/test SmbFileSystemTestCase.java aut/src/test/org/apache/aut/vfs/provider/zip/test NestedZipFileSystemTestCase.java ZipFileSystemTestCase.java aut/src/test/org/apache/aut/vfs/test AbstractFileSystemTestCase.java AbstractReadOnlyFileSystemTestCase.java AbstractWritableFileSystemTestCase.java buildtools/src/java/org/apache/myrmidon/build AntDocNestedTypeSubTask.java AntDocTypeSubTask.java AntTypeSubTask.java AntTypeTagHandler.java AntlibJarTask.java NameUtil.java container/src/java/org/apache/myrmidon/components/builder ATIModelBuilder.java ATIProjectBuilder.java DefaultModelBuilder.java DefaultProjectBuilder.java container/src/java/org/apache/myrmidon/components/configurer ConfigurationState.java ObjectConfigurer.java container/src/java/org/apache/myrmidon/components/event DefaultTaskEventManager.java container/src/java/org/apache/myrmidon/components/extensions ExtensionRepository.java container/src/java/org/apache/myrmidon/components/library DefaultLibrary.java DefaultLibraryManager.java DefinitionBuilder.java MultiParentURLClassLoader.java container/src/java/org/apache/myrmidon/components/property DefaultNameValidator.java DefaultNameValidatorManager.java MapPropertyStore.java container/src/java/org/apache/myrmidon/components/service InstantiatingServiceManager.java container/src/java/org/apache/myrmidon/components/type AbstractTypeFactory.java AggregatingTypeFactory.java DefaultTypeManager.java NamespaceAwareTypeFactory.java TypeName.java container/src/java/org/apache/myrmidon/components/workspace ProjectEntry.java container/src/java/org/apache/myrmidon/frontends ProjectFileFilter.java SwingUI.java container/src/java/org/apache/myrmidon/interfaces EmbeddedAnt.java container/src/java/org/apache/myrmidon/interfaces/deployer Deployer.java TypeDefinition.java container/src/java/org/apache/myrmidon/interfaces/embeddor Embeddor.java container/src/java/org/apache/myrmidon/interfaces/library Library.java container/src/java/org/apache/myrmidon/interfaces/model Project.java container/src/java/org/apache/myrmidon/interfaces/property PropertyResolver.java container/src/java/org/apache/myrmidon/interfaces/role RoleInfo.java container/src/java/org/apache/myrmidon/interfaces/service ServiceDescriptor.java container/src/java/org/apache/myrmidon/interfaces/type ClassLoaderTypeFactory.java DefaultTypeFactory.java container/src/java/org/apache/myrmidon/interfaces/workspace TargetSet.java container/src/java/org/apache/myrmidon/launcher Main.java container/src/test/org/apache/myrmidon DependencyMetricsTestCase.java TrackingTaskListener.java container/src/test/org/apache/myrmidon/components AbstractComponentTest.java container/src/test/org/apache/myrmidon/components/configurer/test MyRole1Adaptor.java MyType1.java MyType2.java container/src/test/org/apache/myrmidon/components/configurer/test/data ConfigTestPropResolution.java ConfigTestReferenceElement.java ConfigTestSetAndAdd.java ConfigTestSetAttribute.java ConfigTestTypedAdderConversion.java container/src/test/org/apache/myrmidon/components/deployer/test TestType1.java container/src/test/org/apache/myrmidon/components/embeddor/test DefaultEmbeddorTest.java container/src/test/org/apache/myrmidon/components/library/test DefaultLibraryManagerTestCase.java container/src/test/org/apache/myrmidon/components/property/test AbstractPropertyResolverTestCase.java ClassicPropertyResolverTestCase.java DefaultPropertyResolverTestCase.java container/src/test/org/apache/myrmidon/components/service/test TestServiceImpl1.java TestServiceImpl2.java container/src/test/org/apache/myrmidon/components/type/test DefaultRoleManagerTestCase.java DefaultTypeManagerTestCase.java container/src/test/org/apache/myrmidon/interfaces/type/test TypeFactoryTestCase.java framework/src/java/org/apache/myrmidon/framework ExecuteTarget.java framework/src/java/org/apache/myrmidon/framework/conditions Equals.java IsTrueCondition.java framework/src/java/org/apache/myrmidon/framework/file FileListToStringConverter.java StringToFileConverter.java framework/src/java/org/apache/myrmidon/framework/listener ProjectEvent.java ProjectListener.java ProjectListenerDeployer.java TaskToProjectListenerAdapter.java framework/src/java/org/apache/myrmidon/framework/project TargetTask.java framework/src/test/org/apache/myrmidon/framework AbstractTaskTestCase.java ExpectExceptionTask.java ExpectedException.java framework/src/test/org/apache/myrmidon/framework/conditions/test NotConditionTestCase.java framework/src/test/org/apache/myrmidon/framework/file/test PathTestCase.java framework/src/test/org/apache/myrmidon/framework/project/test TargetTaskTestCase.java framework/src/todo/org/apache/tools/todo/taskdefs ANTLR.java Cab.java Get.java IContract.java MatchingTask.java Rpm.java SQLExec.java Script.java WaitFor.java framework/src/todo/org/apache/tools/todo/taskdefs/archive Jar.java Unzip.java War.java framework/src/todo/org/apache/tools/todo/taskdefs/javac CompilerAdapter.java CompilerAdapterFactory.java Gcj.java Javac.java Javac12.java Javac13.java JavacExternal.java Jikes.java Jvc.java Kjc.java Sj.java framework/src/todo/org/apache/tools/todo/taskdefs/javacc JJTree.java JavaCC.java framework/src/todo/org/apache/tools/todo/taskdefs/javadoc Javadoc.java framework/src/todo/org/apache/tools/todo/taskdefs/jdepend JDependTask.java framework/src/todo/org/apache/tools/todo/taskdefs/jsp JspC.java WLJspc.java framework/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers CompilerAdapter.java CompilerAdapterFactory.java JasperC.java framework/src/todo/org/apache/tools/todo/taskdefs/junit JUnitTask.java XMLResultAggregator.java framework/src/todo/org/apache/tools/todo/taskdefs/manifest Manifest.java ManifestTask.java ManifestUtil.java Section.java framework/src/todo/org/apache/tools/todo/taskdefs/net MimeMail.java TelnetTask.java framework/src/todo/org/apache/tools/todo/taskdefs/rmic KaffeRmic.java Rmic.java RmicAdapter.java RmicAdapterFactory.java SunRmic.java WLRmic.java framework/src/todo/org/apache/tools/todo/taskdefs/stylebook StyleBook.java framework/src/todo/org/apache/tools/todo/taskdefs/text FixCRLF.java Native2Ascii.java Replacefilter.java framework/src/todo/org/apache/tools/todo/taskdefs/vss MSVSS.java framework/src/todo/org/apache/tools/todo/types ScannerUtil.java SysProperties.java framework/src/todo/org/apache/tools/todo/util/mappers IdentityMapper.java MergingMapper.java framework/src/todo/org/apache/tools/todo/util/regexp JakartaOroRegexp.java JakartaRegexpRegexp.java Jdk14RegexpRegexp.java RegexpFactory.java RegexpMatcherFactory.java Log: Sort & clean imports Clean up some style violations Revision Changes Path 1.12 +3 -4 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatProject.java Index: Ant1CompatProject.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatProject.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Ant1CompatProject.java 9 Jun 2002 13:21:59 -0000 1.11 +++ Ant1CompatProject.java 5 Jul 2002 03:21:51 -0000 1.12 @@ -11,20 +11,19 @@ import java.io.IOException; import java.io.InputStream; import java.util.Enumeration; +import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.HashMap; import org.apache.excalibur.converter.Converter; import org.apache.excalibur.converter.ConverterException; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; import org.apache.myrmidon.interfaces.type.TypeRegistry; - import org.apache.tools.ant.types.Path; /** @@ -382,7 +381,7 @@ / public String getProperty( String name ) { - if ( m_ant1overrides.containsKey( name ) ) + if( m_ant1overrides.containsKey( name ) ) { return (String)m_ant1overrides.get( name ); } 1.6 +6 -6 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatTargetTask.java Index: Ant1CompatTargetTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatTargetTask.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Ant1CompatTargetTask.java 2 Jul 2002 12:32:35 -0000 1.5 +++ Ant1CompatTargetTask.java 5 Jul 2002 03:21:51 -0000 1.6 @@ -49,21 +49,21 @@ property has not been set before executing the contained tasks. / protected void executeContainedTasks( final ModelElement[] tasks ) - throws TaskException + throws TaskException { - if ( m_ifCondition != null ) + if( m_ifCondition != null ) { Object propVal = getContext().getProperty( m_ifCondition ); - if ( propVal == null ) + if( propVal == null ) { return; } } - if ( m_unlessCondition != null ) + if( m_unlessCondition != null ) { Object propVal = getContext().getProperty( m_unlessCondition ); - if ( propVal != null ) + if( propVal != null ) { return; } 1.4 +2 -2 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatTaskAdapter.java Index: Ant1CompatTaskAdapter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatTaskAdapter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Ant1CompatTaskAdapter.java 27 May 2002 02:10:18 -0000 1.3 +++ Ant1CompatTaskAdapter.java 5 Jul 2002 03:21:51 -0000 1.4 @@ -7,8 +7,8 @@ / package org.apache.tools.ant; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.metadata.ModelElement; import org.apache.myrmidon.api.metadata.ModelException; 1.4 +1 -2 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatTypeInstanceTask.java Index: Ant1CompatTypeInstanceTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/Ant1CompatTypeInstanceTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Ant1CompatTypeInstanceTask.java 27 May 2002 02:10:18 -0000 1.3 +++ Ant1CompatTypeInstanceTask.java 5 Jul 2002 03:21:51 -0000 1.4 @@ -11,7 +11,6 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.metadata.ModelElement; import org.apache.myrmidon.api.metadata.ModelException; -import org.apache.myrmidon.api.metadata.Modeller; /** * A task for instantiating Ant1 datatypes. 1.2 +70 -51 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/BuildException.java Index: BuildException.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/BuildException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BuildException.java 14 Apr 2002 12:38:40 -0000 1.1 +++ BuildException.java 5 Jul 2002 03:21:51 -0000 1.2 @@ -53,8 +53,8 @@ / package org.apache.tools.ant; -import java.io.PrintWriter; import java.io.PrintStream; +import java.io.PrintWriter; import org.apache.tools.ant.Location; /* @@ -68,7 +68,8 @@ * * @author James Duncan Davidson / -public class BuildException extends RuntimeException { +public class BuildException extends RuntimeException +{ /* Exception that might have caused this one. / private Throwable m_cause; @@ -79,115 +80,125 @@ /* * Constructs a build exception with no descriptive information. / - public BuildException() { + public BuildException() + { } /* * Constructs an exception with the given descriptive message. - * + * * @param msg A description of or information about the exception. * Should not be <code>null</code>. / - public BuildException(final String msg) { - super(msg); + public BuildException( final String msg ) + { + super( msg ); } /* * Constructs an exception with the given message and exception as * a root cause. - * + * * @param msg A description of or information about the exception. * Should not be <code>null</code> unless a cause is specified. * @param cause The exception that might have caused this one. * May be <code>null</code>. / - public BuildException(final String msg, final Throwable cause) { - super(msg); + public BuildException( final String msg, final Throwable cause ) + { + super( msg ); m_cause = cause; } /* * Constructs an exception with the given message and exception as * a root cause and a location in a file. - * + * * @param msg A description of or information about the exception. * Should not be <code>null</code> unless a cause is specified. * @param cause The exception that might have caused this one. * May be <code>null</code>. - * @param location The location in the project file where the error + * @param location The location in the project file where the error * occurred. Must not be <code>null</code>. / public BuildException( final String msg, final Throwable cause, - final Location location) { - this(msg, cause); + final Location location ) + { + this( msg, cause ); m_location = location; } /* * Constructs an exception with the given exception as a root cause. - * + * * @param cause The exception that might have caused this one. * Should not be <code>null</code>. / - public BuildException(final Throwable cause ) { - this(cause.getMessage(), cause); + public BuildException( final Throwable cause ) + { + this( cause.getMessage(), cause ); } /* - * Constructs an exception with the given descriptive message and a + * Constructs an exception with the given descriptive message and a * location in a file. - * + * * @param msg A description of or information about the exception. * Should not be <code>null</code>. - * @param location The location in the project file where the error + * @param location The location in the project file where the error * occurred. Must not be <code>null</code>. / - public BuildException(final String msg, final Location location) { - super(msg); + public BuildException( final String msg, final Location location ) + { + super( msg ); m_location = location; } /* * Constructs an exception with the given exception as * a root cause and a location in a file. - * + * * @param cause The exception that might have caused this one. * Should not be <code>null</code>. - * @param location The location in the project file where the error + * @param location The location in the project file where the error * occurred. Must not be <code>null</code>. / - public BuildException(final Throwable cause, final Location location) { - this(cause); + public BuildException( final Throwable cause, final Location location ) + { + this( cause ); m_location = location; } /* * Returns the nested exception, if any. - * + * * @return the nested exception, or <code>null</code> if no * exception is associated with this one / - public Throwable getException() { + public Throwable getException() + { return m_cause; } /* * Returns the location of the error and the error message. - * + * * @return the location of the error and the error message / - public String toString() { + public String toString() + { return m_location.toString() + getMessage(); } /* * Sets the file location where the error occurred. - * + * * @param location The file location where the error occurred. * Must not be <code>null</code>. / - public void setLocation(final Location location) { + public void setLocation( final Location location ) + { m_location = location; } @@ -196,48 +207,56 @@ * @return the file location where the error occurred. / - public Location getLocation() { + public Location getLocation() + { return m_location; } /* - * Prints the stack trace for this exception and any + * Prints the stack trace for this exception and any * nested exception to <code>System.err</code>. / - public void printStackTrace() { - printStackTrace(System.err); + public void printStackTrace() + { + printStackTrace( System.err ); } - + /* * Prints the stack trace of this exception and any nested * exception to the specified PrintStream. - * + * * @param ps The PrintStream to print the stack trace to. * Must not be <code>null</code>. / - public void printStackTrace(PrintStream ps) { - synchronized (ps) { - super.printStackTrace(ps); - if (m_cause != null) { - ps.println("--- Nested Exception ---"); - m_cause.printStackTrace(ps); + public void printStackTrace( PrintStream ps ) + { + synchronized( ps ) + { + super.printStackTrace( ps ); + if( m_cause != null ) + { + ps.println( "--- Nested Exception ---" ); + m_cause.printStackTrace( ps ); } } } - + /* * Prints the stack trace of this exception and any nested * exception to the specified PrintWriter. - * + * * @param pw The PrintWriter to print the stack trace to. * Must not be <code>null</code>. / - public void printStackTrace(PrintWriter pw) { - synchronized (pw) { - super.printStackTrace(pw); - if (m_cause != null) { - pw.println("--- Nested Exception ---"); - m_cause.printStackTrace(pw); + public void printStackTrace( PrintWriter pw ) + { + synchronized( pw ) + { + super.printStackTrace( pw ); + if( m_cause != null ) + { + pw.println( "--- Nested Exception ---" ); + m_cause.printStackTrace( pw ); } } } 1.3 +119 -73 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/LoaderUtils.java Index: LoaderUtils.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/LoaderUtils.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LoaderUtils.java 23 May 2002 01:50:24 -0000 1.2 +++ LoaderUtils.java 5 Jul 2002 03:21:51 -0000 1.3 @@ -52,6 +52,7 @@ <http://www.apache.org/>. / package org.apache.tools.ant; + import java.io.BufferedReader; import java.io.File; import java.io.FilenameFilter; @@ -71,7 +72,8 @@ @author Conor MacNeill * @created 9 January 2002 / -public class LoaderUtils { +public class LoaderUtils +{ /* * This is the file that is consulted on remote systems to specify @@ -79,7 +81,6 @@ / public static final String LIST_FILE = "file.list"; - /* * Get the URLs of a set of libraries in the given location * @@ -88,9 +89,10 @@ * @return an array of URLs for the relevant jars * @throws MalformedURLException the URLs cannot be created / - public static URL[] getLocationURLs(URL location, String defaultFile) - throws MalformedURLException { - return getLocationURLs(location, defaultFile, new String[]{".jar"}); + public static URL[] getLocationURLs( URL location, String defaultFile ) + throws MalformedURLException + { + return getLocationURLs( location, defaultFile, new String[]{".jar"} ); } /* @@ -103,42 +105,59 @@ * @throws MalformedURLException if the URL to the jars could not be * formed / - public static URL[] getLocationURLs(URL location, String defaultFile, - String[] extensions) - throws MalformedURLException { + public static URL[] getLocationURLs( URL location, String defaultFile, + String[] extensions ) + throws MalformedURLException + { URL[] urls = null; - if (location.getProtocol().equals("file")) { + if( location.getProtocol().equals( "file" ) ) + { // URL is local filesystem. - urls = getLocalURLs(new File(location.getFile()), extensions); - } else { + urls = getLocalURLs( new File( location.getFile() ), extensions ); + } + else + { // URL is remote - try to read a file with the list of jars - URL jarListURL = new URL(location, LIST_FILE); + URL jarListURL = new URL( location, LIST_FILE ); BufferedReader reader = null; List jarList = new ArrayList(); - try { + try + { InputStreamReader isr - = new InputStreamReader(jarListURL.openStream()); - reader = new BufferedReader(isr); + = new InputStreamReader( jarListURL.openStream() ); + reader = new BufferedReader( isr ); String line = null; - while ((line = reader.readLine().trim()) != null) { - for (int i = 0; i < extensions.length; ++i) { - if (line.endsWith(extensions[i])) { - jarList.add(new URL(location, line)); + while( ( line = reader.readLine().trim() ) != null ) + { + for( int i = 0; i < extensions.length; ++i ) + { + if( line.endsWith( extensions[ i ] ) ) + { + jarList.add( new URL( location, line ) ); break; } } } - urls = (URL[])jarList.toArray(new URL[0]); - } catch (IOException e) { + urls = (URL[])jarList.toArray( new URL[ 0 ] ); + } + catch( IOException e ) + { // use the default location - if (defaultFile != null) { - urls = new URL[]{new URL(location, defaultFile)}; + if( defaultFile != null ) + { + urls = new URL[]{new URL( location, defaultFile )}; } - } finally { - if (reader != null) { - try { + } + finally + { + if( reader != null ) + { + try + { reader.close(); - } catch (IOException e) { + } + catch( IOException e ) + { } } } @@ -154,29 +173,38 @@ @param loader the loader whose path is required * @return the loader's configuration expressed as a classpath / - public static String getClasspath(ClassLoader loader) { + public static String getClasspath( ClassLoader loader ) + { StringBuffer pathBuffer = null; - if (loader instanceof URLClassLoader) { + if( loader instanceof URLClassLoader ) + { URLClassLoader urlLoader = (URLClassLoader)loader; URL[] urls = urlLoader.getURLs(); - for (int i = 0; i < urls.length; ++i) { - if (!urls[i].getProtocol().equals("file")) { + for( int i = 0; i < urls.length; ++i ) + { + if( !urls[ i ].getProtocol().equals( "file" ) ) + { continue; } - String pathElement = urls[i].getFile(); - if (pathBuffer == null) { - pathBuffer = new StringBuffer(pathElement); - } else { - pathBuffer.append(File.pathSeparatorChar); - pathBuffer.append(pathElement); + String pathElement = urls[ i ].getFile(); + if( pathBuffer == null ) + { + pathBuffer = new StringBuffer( pathElement ); + } + else + { + pathBuffer.append( File.pathSeparatorChar ); + pathBuffer.append( pathElement ); } } } String path = pathBuffer == null ? "" : pathBuffer.toString(); ClassLoader parentLoader = loader.getParent(); - if (parentLoader != null) { - String parentPath = getClasspath(parentLoader); - if (parentPath.length() != 0) { + if( parentLoader != null ) + { + String parentPath = getClasspath( parentLoader ); + if( parentPath.length() != 0 ) + { path = parentPath + File.pathSeparator + path; } } @@ -184,7 +212,6 @@ return path; } - /* * Debug method to dump a class loader hierarchy to a PrintStream * URLClassLoaders dump their URLs @@ -192,30 +219,38 @@ * @param loader the class loaders whose configuration is dumped * @param ps PrintStream to which info is sent / - public static void dumpLoader(PrintStream ps, ClassLoader loader) { - if (loader instanceof URLClassLoader) { + public static void dumpLoader( PrintStream ps, ClassLoader loader ) + { + if( loader instanceof URLClassLoader ) + { URLClassLoader urlLoader = (URLClassLoader)loader; URL[] urls = urlLoader.getURLs(); - if (urls.length == 0) { - ps.println(" No URLs"); - } else { - for (int i = 0; i < urls.length; ++i) { - ps.println(" URL: " + urls[i]); + if( urls.length == 0 ) + { + ps.println( " No URLs" ); + } + else + { + for( int i = 0; i < urls.length; ++i ) + { + ps.println( " URL: " + urls[ i ] ); } } - } else { - ps.println("Class Loader: " + loader.getClass().getName()); + } + else + { + ps.println( "Class Loader: " + loader.getClass().getName() ); } ps.println(); ClassLoader parentLoader = loader.getParent(); - if (parentLoader != null) { - ps.println("Parent Loader:"); - dumpLoader(ps, parentLoader); + if( parentLoader != null ) + { + ps.println( "Parent Loader:" ); + dumpLoader( ps, parentLoader ); } } - /* * Get an array of URLs for each file in the filesystem. If the given * location is a directory, it is searched for files of the given @@ -230,20 +265,25 @@ * @throws MalformedURLException if the URLs to the jars cannot be * formed / - private static URL[] getLocalURLs(File location, - final String[] extensions) - throws MalformedURLException { - URL[] urls = new URL[0]; + private static URL[] getLocalURLs( File location, + final String[] extensions ) + throws MalformedURLException + { + URL[] urls = new URL[ 0 ]; - if (!location.exists()) { + if( !location.exists() ) + { return urls; } - if (!location.isDirectory()) { + if( !location.isDirectory() ) + { String path = location.getPath(); - for (int i = 0; i < extensions.length; ++i) { - if (path.endsWith(extensions[i])) { - urls[0] = location.toURL(); + for( int i = 0; i < extensions.length; ++i ) + { + if( path.endsWith( extensions[ i ] ) ) + { + urls[ 0 ] = location.toURL(); break; } } @@ -251,19 +291,24 @@ } File[] jars = location.listFiles( - new FilenameFilter() { - public boolean accept(File dir, String name) { - for (int i = 0; i < extensions.length; ++i) { - if (name.endsWith(extensions[i])) { + new FilenameFilter() + { + public boolean accept( File dir, String name ) + { + for( int i = 0; i < extensions.length; ++i ) + { + if( name.endsWith( extensions[ i ] ) ) + { return true; } } return false; } - }); - urls = new URL[jars.length]; - for (int i = 0; i < jars.length; ++i) { - urls[i] = jars[i].toURL(); + } ); + urls = new URL[ jars.length ]; + for( int i = 0; i < jars.length; ++i ) + { + urls[ i ] = jars[ i ].toURL(); } return urls; } @@ -275,10 +320,11 @@ @param newLoader the new context loader * @return the old context loader / - public static ClassLoader setContextLoader(ClassLoader newLoader) { + public static ClassLoader setContextLoader( ClassLoader newLoader ) + { Thread thread = Thread.currentThread(); ClassLoader currentLoader = thread.getContextClassLoader(); - thread.setContextClassLoader(newLoader); + thread.setContextClassLoader( newLoader ); return currentLoader; } 1.3 +135 -97 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/OriginalAnt1Task.java Index: OriginalAnt1Task.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/OriginalAnt1Task.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- OriginalAnt1Task.java 23 May 2002 01:50:24 -0000 1.2 +++ OriginalAnt1Task.java 5 Jul 2002 03:21:51 -0000 1.3 @@ -59,18 +59,19 @@ * Use Project.createTask to create a new task instance rather than * using this class directly for construction. - * + * * @see Project#createTask / -public abstract class OriginalAnt1Task extends ProjectComponent { +public abstract class OriginalAnt1Task extends ProjectComponent +{ /* Target this task belongs to, if any. / protected Target target = null; /* Description of this task, if any. / protected String description = null; /* Location within the build file of this task definition. / protected Location location = Location.UNKNOWN_LOCATION; - /* - * Name of this task to be used for logging purposes. + /** + * Name of this task to be used for logging purposes. * This defaults to the same as the type, but may be * overridden by the user. For instance, the name "java" * isn't terribly descriptive for a task used within @@ -82,7 +83,7 @@ protected String taskType = null; /** Wrapper for this object, used to configure it at runtime. / protected RuntimeConfigurable wrapper; - /* + /** * Whether or not this task is invalid. A task becomes invalid * if a conflicting class is specified as the implementation for * its type. @@ -90,7 +91,8 @@ private boolean invalid = false; /** Sole constructor. / - public OriginalAnt1Task() { + public OriginalAnt1Task() + { } /* @@ -99,7 +101,8 @@ * @param target Target in whose scope this task belongs. * May be <code>null</code>, indicating a top-level task. / - public void setOwningTarget(Target target) { + public void setOwningTarget( Target target ) + { this.target = target; } @@ -109,26 +112,29 @@ @return The target containing this task, or <code>null</code> if * this task is a top-level task. / - public Target getOwningTarget() { + public Target getOwningTarget() + { return target; } - + /* * Sets the name to use in logging messages. * * @param name The name to use in logging messages. * Should not be <code>null</code>. / - public void setTaskName(String name) { + public void setTaskName( String name ) + { this.taskName = name; } /* * Returns the name to use in logging messages. * - * @return the name to use in logging messages. + * @return the name to use in logging messages. / - public String getTaskName() { + public String getTaskName() + { return taskName; } @@ -138,30 +144,33 @@ @param type The name the task has been invoked as. * Should not be <code>null</code>. / - void setTaskType(String type) { + void setTaskType( String type ) + { this.taskType = type; } - /* + /** * Sets a description of the current action. This may be used for logging * purposes. - * - * @param desc Description of the current action. + * + * @param desc Description of the current action. * May be <code>null</code>, indicating that no description is * available. - * + * / - public void setDescription( String desc ) { + public void setDescription( String desc ) + { description = desc; } /* * Returns the description of the current action. - * + * * @return the description of the current action, or <code>null</code> if * no description is available. / - public String getDescription() { + public String getDescription() + { return description; } @@ -171,68 +180,77 @@ * @throws BuildException if someting goes wrong with the build / - public void init() throws BuildException {} + public void init() throws BuildException + { + } /* - * Called by the project to let the task do its work. This method may be - * called more than once, if the task is invoked more than once. - * For example, - * if target1 and target2 both depend on target3, then running + * Called by the project to let the task do its work. This method may be + * called more than once, if the task is invoked more than once. + * For example, + * if target1 and target2 both depend on target3, then running * "ant target1 target2" will run all tasks in target3 twice. * * @throws BuildException if something goes wrong with the build / - public void execute() throws BuildException {} + public void execute() throws BuildException + { + } /* * Returns the file/location where this task was defined. - * - * @return the file/location where this task was defined. + * + * @return the file/location where this task was defined. * Should not return <code>null</code>. Location.UNKNOWN_LOCATION * is used for unknown locations. - * + * * @see Location#UNKNOWN_LOCATION / - public Location getLocation() { + public Location getLocation() + { return location; } /* * Sets the file/location where this task was defined. - * + * * @param location The file/location where this task was defined. * Should not be <code>null</code> - use * Location.UNKNOWN_LOCATION if the location isn't known. - * + * * @see Location#UNKNOWN_LOCATION / - public void setLocation(Location location) { + public void setLocation( Location location ) + { this.location = location; } /* * Returns the wrapper used for runtime configuration. - * + * * @return the wrapper used for runtime configuration. This * method will generate a new wrapper (and cache it) * if one isn't set already. / - public RuntimeConfigurable getRuntimeConfigurableWrapper() { - if (wrapper == null) { - wrapper = new RuntimeConfigurable(this, getTaskName()); + public RuntimeConfigurable getRuntimeConfigurableWrapper() + { + if( wrapper == null ) + { + wrapper = new RuntimeConfigurable( this, getTaskName() ); } return wrapper; } /* * Sets the wrapper to be used for runtime configuration. - * + * * @param wrapper The wrapper to be used for runtime configuration. * May be <code>null</code>, in which case the next call * to getRuntimeConfigurableWrapper will generate a new * wrapper. / - protected void setRuntimeConfigurableWrapper(RuntimeConfigurable wrapper) { + protected void setRuntimeConfigurableWrapper( RuntimeConfigurable wrapper ) + { this.wrapper = wrapper; } @@ -242,88 +260,105 @@ // unless I've missed something. /* * Configures this task - if it hasn't been done already. - * If the task has been invalidated, it is replaced with an + * If the task has been invalidated, it is replaced with an * UnknownElement task which uses the new definition in the project. * * @throws BuildException if the task cannot be configured. / - public void maybeConfigure() throws BuildException { - if (!invalid) { - if (wrapper != null) { - wrapper.maybeConfigure(project); + public void maybeConfigure() throws BuildException + { + if( !invalid ) + { + if( wrapper != null ) + { + wrapper.maybeConfigure( project ); } - } else { + } + else + { getReplacement(); } } - /* + /** * Handles a line of output by logging it with the INFO priority. - * + * * @param line The line of output to log. Should not be <code>null</code>. / - protected void handleOutput(String line) { - log(line, Project.MSG_INFO); + protected void handleOutput( String line ) + { + log( line, Project.MSG_INFO ); } - - /* + + /** * Handles an error line by logging it with the INFO priority. - * + * * @param line The error line to log. Should not be <code>null</code>. / - protected void handleErrorOutput(String line) { - log(line, Project.MSG_ERR); + protected void handleErrorOutput( String line ) + { + log( line, Project.MSG_ERR ); } - - /* - * Logs a message with the default (INFO) priority. - * + + /** + * Logs a message with the default (INFO) priority. + * * @param msg The message to be logged. Should not be <code>null</code>. - / - public void log(String msg) { - log(msg, Project.MSG_INFO); - } - - /* + / + public void log( String msg ) + { + log( msg, Project.MSG_INFO ); + } + + /* * Logs a mesage with the given priority. This delegates * the actual logging to the project. - * + * * @param msg The message to be logged. Should not be <code>null</code>. - * @param msgLevel The message priority at which this message is to + * @param msgLevel The message priority at which this message is to * be logged. - / - public void log(String msg, int msgLevel) { - project.log(getThis(), msg, msgLevel); - } - + / + public void log( String msg, int msgLevel ) + { + project.log( getThis(), msg, msgLevel ); + } + /** * Performs this task if it's still valid, or gets a replacement * version and performs that otherwise. - * + * * Performing a task consists of firing a task started event, * configuring the task, executing it, and then firing task finished * event. If a runtime exception is thrown, the task finished event * is still fired, but with the exception as the cause. / - public final void perform() { - if (!invalid) { - try { - project.fireTaskStarted(getThis()); + public final void perform() + { + if( !invalid ) + { + try + { + project.fireTaskStarted( getThis() ); maybeConfigure(); execute(); - project.fireTaskFinished(getThis(), null); + project.fireTaskFinished( getThis(), null ); } - catch (RuntimeException exc) { - if (exc instanceof BuildException) { - BuildException be = (BuildException) exc; - if (be.getLocation() == Location.UNKNOWN_LOCATION) { - be.setLocation(getLocation()); + catch( RuntimeException exc ) + { + if( exc instanceof BuildException ) + { + BuildException be = (BuildException)exc; + if( be.getLocation() == Location.UNKNOWN_LOCATION ) + { + be.setLocation( getLocation() ); } } - project.fireTaskFinished(getThis(), exc); + project.fireTaskFinished( getThis(), exc ); throw exc; } - } else { + } + else + { UnknownElement ue = getReplacement(); Task task = ue.getTask(); task.perform(); @@ -334,7 +369,8 @@ Marks this task as invalid. Any further use of this task * will go through a replacement with the updated definition. / - final void markInvalid() { + final void markInvalid() + { invalid = true; } @@ -350,17 +386,19 @@ * @return the UnknownElement instance for the new definition of this task. / - private UnknownElement getReplacement() { - if (replacement == null) { - replacement = new UnknownElement(taskType); - replacement.setProject(project); - replacement.setTaskType(taskType); - replacement.setTaskName(taskName); - replacement.setLocation(location); - replacement.setOwningTarget(target); - replacement.setRuntimeConfigurableWrapper(wrapper); - wrapper.setProxy(replacement); - target.replaceChild(getThis(), replacement); + private UnknownElement getReplacement() + { + if( replacement == null ) + { + replacement = new UnknownElement( taskType ); + replacement.setProject( project ); + replacement.setTaskType( taskType ); + replacement.setTaskName( taskName ); + replacement.setLocation( location ); + replacement.setOwningTarget( target ); + replacement.setRuntimeConfigurableWrapper( wrapper ); + wrapper.setProxy( replacement ); + target.replaceChild( getThis(), replacement ); replacement.maybeConfigure(); } return replacement; @@ -368,7 +406,7 @@ private Task getThis() { - return (Task) this; + return (Task)this; } } 1.2 +332 -240 jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/types/Path.java Index: Path.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/types/Path.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Path.java 14 Apr 2002 12:38:41 -0000 1.1 +++ Path.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -54,20 +54,16 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.PathTokenizer; -import org.apache.tools.ant.LoaderUtils; - import java.io.File; - import java.util.Enumeration; import java.util.Locale; import java.util.Stack; import java.util.Vector; - - +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.LoaderUtils; +import org.apache.tools.ant.PathTokenizer; +import org.apache.tools.ant.Project; /* * *********************************************************************** @@ -102,14 +98,13 @@ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> / -public class Path extends DataType implements Cloneable { +public class Path extends DataType implements Cloneable +{ private Vector elements; - - public static Path systemClasspath = - new Path(null, System.getProperty("java.class.path")); - + public static Path systemClasspath = + new Path( null, System.getProperty( "java.class.path" ) ); //Modified from original source. //Append Ant1Compat classpath to systemclasspath. @@ -126,33 +121,39 @@ /* * Helper class, holds the nested <code><pathelement></code> values. / - public class PathElement { + public class PathElement + { private String[] parts; - public void setLocation(File loc) { - parts = new String[] {translateFile(loc.getAbsolutePath())}; + public void setLocation( File loc ) + { + parts = new String[]{translateFile( loc.getAbsolutePath() )}; } - public void setPath(String path) { - parts = Path.translatePath(getProject(), path); + public void setPath( String path ) + { + parts = Path.translatePath( getProject(), path ); } - public String[] getParts() { + public String[] getParts() + { return parts; } } /* * Invoked by IntrospectionHelper for <code>setXXX(Path p)</code> - * attribute setters. + * attribute setters. / - public Path(Project p, String path) { - this(p); - createPathElement().setPath(path); + public Path( Project p, String path ) + { + this( p ); + createPathElement().setPath( path ); } - public Path(Project project) { - setProject(project); + public Path( Project project ) + { + setProject( project ); elements = new Vector(); } @@ -161,23 +162,26 @@ @param location the location of the element to add (must not be * <code>null</code> nor empty. / - public void setLocation(File location) throws BuildException { - if (isReference()) { + public void setLocation( File location ) throws BuildException + { + if( isReference() ) + { throw tooManyAttributes(); } - createPathElement().setLocation(location); + createPathElement().setLocation( location ); } - /* * Parses a path definition and creates single PathElements. * @param path the path definition. / - public void setPath(String path) throws BuildException { - if (isReference()) { + public void setPath( String path ) throws BuildException + { + if( isReference() ) + { throw tooManyAttributes(); } - createPathElement().setPath(path); + createPathElement().setPath( path ); } /* @@ -186,46 +190,54 @@ * <p>You must not set another attribute or nest elements inside * this element if you make it a reference.</p> / - public void setRefid(Reference r) throws BuildException { - if (!elements.isEmpty()) { + public void setRefid( Reference r ) throws BuildException + { + if( !elements.isEmpty() ) + { throw tooManyAttributes(); } - elements.addElement(r); - super.setRefid(r); + elements.addElement( r ); + super.setRefid( r ); } /* * Creates the nested <code><pathelement></code> element. / - public PathElement createPathElement() throws BuildException { - if (isReference()) { + public PathElement createPathElement() throws BuildException + { + if( isReference() ) + { throw noChildrenAllowed(); } PathElement pe = new PathElement(); - elements.addElement(pe); + elements.addElement( pe ); return pe; } /* * Adds a nested <code><fileset></code> element. / - public void addFileset(FileSet fs) throws BuildException { - if (isReference()) { + public void addFileset( FileSet fs ) throws BuildException + { + if( isReference() ) + { throw noChildrenAllowed(); } - elements.addElement(fs); + elements.addElement( fs ); checked = false; } /* * Creates a nested <code><path></code> element. / - public Path createPath() throws BuildException { - if (isReference()) { + public Path createPath() throws BuildException + { + if( isReference() ) + { throw noChildrenAllowed(); } - Path p = new Path(getProject()); - elements.addElement(p); + Path p = new Path( getProject() ); + elements.addElement( p ); checked = false; return p; } @@ -233,40 +245,51 @@ /* * Append the contents of the other Path instance to this. / - public void append(Path other) { - if (other == null) { - return; + public void append( Path other ) + { + if( other == null ) + { + return; } String[] l = other.list(); - for (int i=0; i<l.length; i++) { - if (elements.indexOf(l[i]) == -1) { - elements.addElement(l[i]); + for( int i = 0; i < l.length; i++ ) + { + if( elements.indexOf( l[ i ] ) == -1 ) + { + elements.addElement( l[ i ] ); } } } - /* + /** * Adds the components on the given path which exist to this * Path. Components that don't exist, aren't added. * * @param source - source path whose components are examined for existence / - public void addExisting(Path source) { + public void addExisting( Path source ) + { String[] list = source.list(); - for (int i=0; i<list.length; i++) { + for( int i = 0; i < list.length; i++ ) + { File f = null; - if (getProject() != null) { - f = getProject().resolveFile(list[i]); - } - else { - f = new File(list[i]); - } - - if (f.exists()) { - setLocation(f); - } else { - log("dropping " + f + " from path as it doesn't exist", - Project.MSG_VERBOSE); + if( getProject() != null ) + { + f = getProject().resolveFile( list[ i ] ); + } + else + { + f = new File( list[ i ] ); + } + + if( f.exists() ) + { + setLocation( f ); + } + else + { + log( "dropping " + f + " from path as it doesn't exist", + Project.MSG_VERBOSE ); } } } @@ -275,83 +298,102 @@ Returns all path elements defined by this and nested path objects. * @return list of path elements. / - public String[] list() { - if (!checked) { + public String[] list() + { + if( !checked ) + { // make sure we don't have a circular reference here Stack stk = new Stack(); - stk.push(this); - dieOnCircularReference(stk, getProject()); + stk.push( this ); + dieOnCircularReference( stk, getProject() ); } - Vector result = new Vector(2elements.size()); - for (int i=0; i<elements.size(); i++) { - Object o = elements.elementAt(i); - if (o instanceof Reference) { - Reference r = (Reference) o; - o = r.getReferencedObject(getProject()); + Vector result = new Vector( 2 * elements.size() ); + for( int i = 0; i < elements.size(); i++ ) + { + Object o = elements.elementAt( i ); + if( o instanceof Reference ) + { + Reference r = (Reference)o; + o = r.getReferencedObject( getProject() ); // we only support references to paths right now - if (!(o instanceof Path)) { - String msg = r.getRefId()+" doesn\'t denote a path"; - throw new BuildException(msg); + if( !( o instanceof Path ) ) + { + String msg = r.getRefId() + " doesn\'t denote a path"; + throw new BuildException( msg ); } } - - if (o instanceof String) { + + if( o instanceof String ) + { // obtained via append - addUnlessPresent(result, (String) o); - } else if (o instanceof PathElement) { - String[] parts = ((PathElement) o).getParts(); - if (parts == null) { - throw new BuildException("You must either set location or path on <pathelement>"); + addUnlessPresent( result, (String)o ); + } + else if( o instanceof PathElement ) + { + String[] parts = ( (PathElement)o ).getParts(); + if( parts == null ) + { + throw new BuildException( "You must either set location or path on <pathelement>" ); } - for (int j=0; j<parts.length; j++) { - addUnlessPresent(result, parts[j]); + for( int j = 0; j < parts.length; j++ ) + { + addUnlessPresent( result, parts[ j ] ); } - } else if (o instanceof Path) { - Path p = (Path) o; - if (p.getProject() == null) { - p.setProject(getProject()); + } + else if( o instanceof Path ) + { + Path p = (Path)o; + if( p.getProject() == null ) + { + p.setProject( getProject() ); } String[] parts = p.list(); - for (int j=0; j<parts.length; j++) { - addUnlessPresent(result, parts[j]); + for( int j = 0; j < parts.length; j++ ) + { + addUnlessPresent( result, parts[ j ] ); } - } else if (o instanceof FileSet) { - FileSet fs = (FileSet) o; - DirectoryScanner ds = fs.getDirectoryScanner(getProject()); + } + else if( o instanceof FileSet ) + { + FileSet fs = (FileSet)o; + DirectoryScanner ds = fs.getDirectoryScanner( getProject() ); String[] s = ds.getIncludedFiles(); - File dir = fs.getDir(getProject()); - for (int j=0; j<s.length; j++) { - File f = new File(dir, s[j]); + File dir = fs.getDir( getProject() ); + for( int j = 0; j < s.length; j++ ) + { + File f = new File( dir, s[ j ] ); String absolutePath = f.getAbsolutePath(); - addUnlessPresent(result, translateFile(absolutePath)); - } + addUnlessPresent( result, translateFile( absolutePath ) ); + } } } - String[] res = new String[result.size()]; - result.copyInto(res); + String[] res = new String[ result.size() ]; + result.copyInto( res ); return res; } - /** * Returns a textual representation of the path, which can be used as * CLASSPATH or PATH environment variable definition. * @return a textual representation of the path. / - public String toString() { + public String toString() + { final String[] list = list(); // empty path return empty string - if (list.length == 0) { - return ""; + if( list.length == 0 ) + { + return ""; } // path containing one or more elements - final StringBuffer result = new StringBuffer(list[0].toString()); - for (int i=1; i < list.length; i++) { - result.append(File.pathSeparatorChar); - result.append(list[i]); + final StringBuffer result = new StringBuffer( list[ 0 ].toString() ); + for( int i = 1; i < list.length; i++ ) + { + result.append( File.pathSeparatorChar ); + result.append( list[ i ] ); } return result.toString(); @@ -360,46 +402,55 @@ /* * Splits a PATH (with : or ; as separators) into its parts. / - public static String[] translatePath(Project project, String source) { + public static String[] translatePath( Project project, String source ) + { final Vector result = new Vector(); - if (source == null) { - return new String[0]; + if( source == null ) + { + return new String[ 0 ]; } - PathTokenizer tok = new PathTokenizer(source); + PathTokenizer tok = new PathTokenizer( source ); StringBuffer element = new StringBuffer(); - while (tok.hasMoreTokens()) { - element.setLength(0); + while( tok.hasMoreTokens() ) + { + element.setLength( 0 ); String pathElement = tok.nextToken(); - try { - element.append(resolveFile(project, pathElement)); - } - catch (BuildException e) { - project.log("Dropping path element " + pathElement + " as it is not valid relative to the project", - Project.MSG_VERBOSE); + try + { + element.append( resolveFile( project, pathElement ) ); + } + catch( BuildException e ) + { + project.log( "Dropping path element " + pathElement + " as it is not valid relative to the project", + Project.MSG_VERBOSE ); + } + for( int i = 0; i < element.length(); i++ ) + { + translateFileSep( element, i ); } - for (int i=0; i<element.length(); i++) { - translateFileSep(element, i); - } - result.addElement(element.toString()); + result.addElement( element.toString() ); } - String[] res = new String[result.size()]; - result.copyInto(res); + String[] res = new String[ result.size() ]; + result.copyInto( res ); return res; } /* * Returns its argument with all file separator characters - * replaced so that they match the local OS conventions. + * replaced so that they match the local OS conventions. / - public static String translateFile(String source) { - if (source == null) { - return ""; + public static String translateFile( String source ) + { + if( source == null ) + { + return ""; } - final StringBuffer result = new StringBuffer(source); - for (int i=0; i < result.length(); i++) { - translateFileSep(result, i); + final StringBuffer result = new StringBuffer( source ); + for( int i = 0; i < result.length(); i++ ) + { + translateFileSep( result, i ); } return result.toString(); @@ -408,11 +459,13 @@ /* * Translates all occurrences of / or \ to correct separator of the * current platform and returns whether it had to do any - * replacements. + * replacements. / - protected static boolean translateFileSep(StringBuffer buffer, int pos) { - if (buffer.charAt(pos) == '/' \|\| buffer.charAt(pos) == '\\') { - buffer.setCharAt(pos, File.separatorChar); + protected static boolean translateFileSep( StringBuffer buffer, int pos ) + { + if( buffer.charAt( pos ) == '/' \|\| buffer.charAt( pos ) == '\\' ) + { + buffer.setCharAt( pos, File.separatorChar ); return true; } return false; @@ -421,43 +474,53 @@ /* * How many parts does this Path instance consist of. / - public int size() { + public int size() + { return list().length; } /* * Return a Path that holds the same elements as this instance. / - public Object clone() { - Path p = new Path(getProject()); - p.append(this); + public Object clone() + { + Path p = new Path( getProject() ); + p.append( this ); return p; } /* * Overrides the version of DataType to recurse on all DataType - * child elements that may have been added. + * child elements that may have been added. / - protected void dieOnCircularReference(Stack stk, Project p) - throws BuildException { + protected void dieOnCircularReference( Stack stk, Project p ) + throws BuildException + { - if (checked) { + if( checked ) + { return; } Enumeration enum = elements.elements(); - while (enum.hasMoreElements()) { + while( enum.hasMoreElements() ) + { Object o = enum.nextElement(); - if (o instanceof Reference) { - o = ((Reference) o).getReferencedObject(p); + if( o instanceof Reference ) + { + o = ( (Reference)o ).getReferencedObject( p ); } - if (o instanceof DataType) { - if (stk.contains(o)) { + if( o instanceof DataType ) + { + if( stk.contains( o ) ) + { throw circularReference(); - } else { - stk.push(o); - ((DataType) o).dieOnCircularReference(stk, p); + } + else + { + stk.push( o ); + ( (DataType)o ).dieOnCircularReference( stk, p ); stk.pop(); } } @@ -470,9 +533,11 @@ * <p>Assume the filename is absolute if project is null.</p> / - private static String resolveFile(Project project, String relativeName) { - if (project != null) { - File f = project.resolveFile(relativeName); + private static String resolveFile( Project project, String relativeName ) + { + if( project != null ) + { + File f = project.resolveFile( relativeName ); return f.getAbsolutePath(); } return relativeName; @@ -481,9 +546,11 @@ /* * Adds a String to the Vector if it isn't already included. / - private static void addUnlessPresent(Vector v, String s) { - if (v.indexOf(s) == -1) { - v.addElement(s); + private static void addUnlessPresent( Vector v, String s ) + { + if( v.indexOf( s ) == -1 ) + { + v.addElement( s ); } } @@ -492,8 +559,9 @@ the ${build.sysclasspath} property - using "last" as * default value. / - public Path concatSystemClasspath() { - return concatSystemClasspath("last"); + public Path concatSystemClasspath() + { + return concatSystemClasspath( "last" ); } /* @@ -501,42 +569,52 @@ * the ${build.sysclasspath} property - using the supplied value * if ${build.sysclasspath} has not been set. / - public Path concatSystemClasspath(String defValue) { + public Path concatSystemClasspath( String defValue ) + { - Path result = new Path(getProject()); + Path result = new Path( getProject() ); String order = defValue; - if (getProject() != null) { - String o = getProject().getProperty("build.sysclasspath"); - if (o != null) { + if( getProject() != null ) + { + String o = getProject().getProperty( "build.sysclasspath" ); + if( o != null ) + { order = o; } } - - if (order.equals("only")) { + + if( order.equals( "only" ) ) + { // only: the developer knows what (s)he is doing - result.addExisting(Path.systemClasspath); - - } else if (order.equals("first")) { + result.addExisting( Path.systemClasspath ); + + } + else if( order.equals( "first" ) ) + { // first: developer could use a little help - result.addExisting(Path.systemClasspath); - result.addExisting(this); + result.addExisting( Path.systemClasspath ); + result.addExisting( this ); - } else if (order.equals("ignore")) { + } + else if( order.equals( "ignore" ) ) + { // ignore: don't trust anyone - result.addExisting(this); + result.addExisting( this ); - } else { + } + else + { // last: don't trust the developer - if (!order.equals("last")) { - log("invalid value for build.sysclasspath: " + order, - Project.MSG_WARN); + if( !order.equals( "last" ) ) + { + log( "invalid value for build.sysclasspath: " + order, + Project.MSG_WARN ); } - result.addExisting(this); - result.addExisting(Path.systemClasspath); + result.addExisting( this ); + result.addExisting( Path.systemClasspath ); } - return result; @@ -545,53 +623,60 @@ /* * Add the Java Runtime classes to this Path instance. / - public void addJavaRuntime() { - if (System.getProperty("java.vendor").toLowerCase(Locale.US).indexOf("microsoft") >= 0) { + public void addJavaRuntime() + { + if( System.getProperty( "java.vendor" ).toLowerCase( Locale.US ).indexOf( "microsoft" ) >= 0 ) + { // Pull in .zip from packages directory FileSet msZipFiles = new FileSet(); - msZipFiles.setDir(new File(System.getProperty("java.home") + File.separator + "Packages")); - msZipFiles.setIncludes(".ZIP"); - addFileset(msZipFiles); - } else if("Kaffe".equals(System.getProperty("java.vm.name"))) { + msZipFiles.setDir( new File( System.getProperty( "java.home" ) + File.separator + "Packages" ) ); + msZipFiles.setIncludes( ".ZIP" ); + addFileset( msZipFiles ); + } + else if( "Kaffe".equals( System.getProperty( "java.vm.name" ) ) ) + { FileSet kaffeJarFiles = new FileSet(); - kaffeJarFiles.setDir(new File(System.getProperty("java.home") - + File.separator + "share" - + File.separator + "kaffe")); - - kaffeJarFiles.setIncludes(".jar"); - addFileset(kaffeJarFiles); - } - else if (Project.getJavaVersion() == Project.JAVA_1_1) { - addExisting(new Path(null, - System.getProperty("java.home") - + File.separator + "lib" - + File.separator - + "classes.zip")); - } else { + kaffeJarFiles.setDir( new File( System.getProperty( "java.home" ) + + File.separator + "share" + + File.separator + "kaffe" ) ); + + kaffeJarFiles.setIncludes( ".jar" ); + addFileset( kaffeJarFiles ); + } + else if( Project.getJavaVersion() == Project.JAVA_1_1 ) + { + addExisting( new Path( null, + System.getProperty( "java.home" ) + + File.separator + "lib" + + File.separator + + "classes.zip" ) ); + } + else + { // JDK > 1.1 seems to set java.home to the JRE directory. - addExisting(new Path(null, - System.getProperty("java.home") - + File.separator + "lib" - + File.separator + "rt.jar")); + addExisting( new Path( null, + System.getProperty( "java.home" ) + + File.separator + "lib" + + File.separator + "rt.jar" ) ); // Just keep the old version as well and let addExisting // sort it out. - addExisting(new Path(null, - System.getProperty("java.home") - + File.separator +"jre" - + File.separator + "lib" - + File.separator + "rt.jar")); - + addExisting( new Path( null, + System.getProperty( "java.home" ) + + File.separator + "jre" + + File.separator + "lib" + + File.separator + "rt.jar" ) ); + // Added for MacOS X - addExisting(new Path(null, - System.getProperty("java.home") - + File.separator + ".." - + File.separator + "Classes" - + File.separator + "classes.jar")); - addExisting(new Path(null, - System.getProperty("java.home") - + File.separator + ".." - + File.separator + "Classes" - + File.separator + "ui.jar")); + addExisting( new Path( null, + System.getProperty( "java.home" ) + + File.separator + ".." + + File.separator + "Classes" + + File.separator + "classes.jar" ) ); + addExisting( new Path( null, + System.getProperty( "java.home" ) + + File.separator + ".." + + File.separator + "Classes" + + File.separator + "ui.jar" ) ); } } @@ -602,24 +687,31 @@ * so that you don't have to specify them all one by one. * @param extdirs - Path to append files to / - public void addExtdirs(Path extdirs) { - if (extdirs == null) { - String extProp = System.getProperty("java.ext.dirs"); - if (extProp != null) { - extdirs = new Path(getProject(), extProp); - } else { + public void addExtdirs( Path extdirs ) + { + if( extdirs == null ) + { + String extProp = System.getProperty( "java.ext.dirs" ); + if( extProp != null ) + { + extdirs = new Path( getProject(), extProp ); + } + else + { return; } } String[] dirs = extdirs.list(); - for (int i=0; i<dirs.length; i++) { - File dir = getProject().resolveFile(dirs[i]); - if (dir.exists() && dir.isDirectory()) { + for( int i = 0; i < dirs.length; i++ ) + { + File dir = getProject().resolveFile( dirs[ i ] ); + if( dir.exists() && dir.isDirectory() ) + { FileSet fs = new FileSet(); - fs.setDir(dir); - fs.setIncludes(""); - addFileset(fs); + fs.setDir( dir ); + fs.setIncludes( "" ); + addFileset( fs ); } } } 1.6 +2 -2 jakarta-ant-myrmidon/ant1compat/src/test/org/apache/tools/ant/test/Ant1CompatTestCase.java Index: Ant1CompatTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/test/org/apache/tools/ant/test/Ant1CompatTestCase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Ant1CompatTestCase.java 11 Jun 2002 05:30:47 -0000 1.5 +++ Ant1CompatTestCase.java 5 Jul 2002 03:21:52 -0000 1.6 @@ -109,7 +109,7 @@ tracker.addExpectedMessage( "/call-target/property-test/echo", "test-prop = [set in calling target]" ); tracker.addExpectedMessage( "/call-target/property-test/echo", - "test-prop = [test-value]" ); + "test-prop = [test-value]" ); executeTarget( projectFile, "ant-setprops-test", tracker ); } 1.2 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/archive/BUnzip2.java Index: BUnzip2.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/archive/BUnzip2.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BUnzip2.java 14 Apr 2002 10:54:02 -0000 1.1 +++ BUnzip2.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -9,8 +9,8 @@ import java.io.IOException; import java.io.InputStream; -import org.apache.myrmidon.api.TaskException; import org.apache.excalibur.bzip2.CBZip2InputStream; +import org.apache.myrmidon.api.TaskException; /* * Expands a file that has been compressed with the BZIP2 algorithm. Normally 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/build/Patch.java Index: Patch.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/build/Patch.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Patch.java 14 Apr 2002 10:55:08 -0000 1.1 +++ Patch.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -130,7 +130,7 @@ } } - private Execute buildCommand( ) + private Execute buildCommand() { final Execute cmd = new Execute(); cmd.setExecutable( "patch" ); 1.2 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/build/UpToDateCondition.java Index: UpToDateCondition.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/build/UpToDateCondition.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UpToDateCondition.java 14 Apr 2002 10:55:08 -0000 1.1 +++ UpToDateCondition.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -98,7 +98,7 @@ { final FileSet fs = (FileSet)enum.next(); final DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); - if ( !scanDir( fs.getDir(), ds.getIncludedFiles(), context ) ) + if( !scanDir( fs.getDir(), ds.getIncludedFiles(), context ) ) { return false; } 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AbstractAvailableCondition.java Index: AbstractAvailableCondition.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AbstractAvailableCondition.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractAvailableCondition.java 14 Apr 2002 10:55:08 -0000 1.1 +++ AbstractAvailableCondition.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -10,8 +10,8 @@ import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.conditions.Condition; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; /** * An abstract condition which checks for the availability of a particular 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/ExtFileNameMapper.java Index: ExtFileNameMapper.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/ExtFileNameMapper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExtFileNameMapper.java 14 Apr 2002 10:55:08 -0000 1.1 +++ ExtFileNameMapper.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -33,11 +33,11 @@ final String name = FileUtil.removeExtension( filename ); if( m_extension != null ) { - return new String[]{ name + '.' + m_extension }; + return new String[]{name + '.' + m_extension}; } else { - return new String[]{ name }; + return new String[]{name}; } } } 1.2 +5 -5 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/IsInstanceCondition.java Index: IsInstanceCondition.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/IsInstanceCondition.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IsInstanceCondition.java 2 Jul 2002 02:21:24 -0000 1.1 +++ IsInstanceCondition.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -7,13 +7,13 @@ / package org.apache.antlib.core; -import org.apache.myrmidon.framework.conditions.Condition; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.interfaces.role.RoleManager; +import org.apache.myrmidon.framework.conditions.Condition; import org.apache.myrmidon.interfaces.role.RoleInfo; -import org.apache.avalon.excalibur.i18n.ResourceManager; -import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.interfaces.role.RoleManager; /* * Checks whether a property is set to an instance of a particular type. 1.2 +3 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/LoadDOMTask.java Index: LoadDOMTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/LoadDOMTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LoadDOMTask.java 26 Jun 2002 02:12:36 -0000 1.1 +++ LoadDOMTask.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -9,10 +9,10 @@ import java.io.File; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.AbstractTask; +import org.apache.myrmidon.api.TaskException; import org.w3c.dom.Document; / 1.3 +8 -8 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/LoadPropertyResourceTask.java Index: LoadPropertyResourceTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/LoadPropertyResourceTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LoadPropertyResourceTask.java 24 May 2002 04:30:59 -0000 1.2 +++ LoadPropertyResourceTask.java 5 Jul 2002 03:21:52 -0000 1.3 @@ -8,11 +8,11 @@ package org.apache.antlib.core; import java.io.InputStream; -import org.apache.myrmidon.framework.file.Path; -import org.apache.myrmidon.framework.file.FileListUtil; -import org.apache.myrmidon.api.TaskException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; / * A task that loads properties from a resource. @@ -53,10 +53,10 @@ throw new TaskException( message ); } - final String debug = - REZ.getString( "load-resource.loading.notice", - m_resource ); - getContext().debug( debug ); + final String debug = + REZ.getString( "load-resource.loading.notice", + m_resource ); + getContext().debug( debug ); final ClassLoader classLoader = FileListUtil.createClassLoader( m_classpath, getContext() ); 1.2 +4 -4 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/PrefixFileNameMapper.java Index: PrefixFileNameMapper.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/PrefixFileNameMapper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PrefixFileNameMapper.java 14 Apr 2002 10:55:08 -0000 1.1 +++ PrefixFileNameMapper.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -30,7 +30,7 @@ public void setPrefix( final String prefix ) { m_prefix = prefix; - if( ! m_prefix.endsWith( "/" ) ) + if( !m_prefix.endsWith( "/" ) ) { m_prefix = m_prefix + '/'; } @@ -46,11 +46,11 @@ { if( m_prefix == null ) { - return new String[]{ sourceFileName }; + return new String[]{sourceFileName}; } else { - return new String[] { m_prefix + sourceFileName }; + return new String[]{m_prefix + sourceFileName}; } } } 1.2 +2 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/ChangeLog.java Index: ChangeLog.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/ChangeLog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog.java 14 Apr 2002 10:56:02 -0000 1.1 +++ ChangeLog.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -25,9 +25,8 @@ import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.myrmidon.framework.FileSet; -import org.apache.myrmidon.framework.nativelib.Commandline; +import org.apache.myrmidon.framework.nativelib.Execute; /** * Change log task. 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/Cvs.java Index: Cvs.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/Cvs.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Cvs.java 14 Apr 2002 10:56:02 -0000 1.1 +++ Cvs.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -11,8 +11,8 @@ import java.util.Properties; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.myrmidon.framework.nativelib.Commandline; +import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.tools.todo.util.FileUtils; /** 1.2 +3 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/CvsUser.java Index: CvsUser.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/cvslib/CvsUser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CvsUser.java 14 Apr 2002 10:56:02 -0000 1.1 +++ CvsUser.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -7,9 +7,9 @@ / package org.apache.antlib.cvslib; -import org.apache.myrmidon.api.TaskException; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskException; /* * Represents a CVS user with a userID and a full name. 1.3 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/dotnet/CSharp.java Index: CSharp.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/dotnet/CSharp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CSharp.java 23 May 2002 01:50:24 -0000 1.2 +++ CSharp.java 5 Jul 2002 03:21:52 -0000 1.3 @@ -9,11 +9,11 @@ import java.io.File; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.nativelib.ArgumentList; import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.myrmidon.framework.nativelib.ArgumentList; -import org.apache.myrmidon.framework.file.Path; /** * This task compiles CSharp source into executables or modules. The task will 1.3 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/dotnet/Ilasm.java Index: Ilasm.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/dotnet/Ilasm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Ilasm.java 23 May 2002 01:50:24 -0000 1.2 +++ Ilasm.java 5 Jul 2002 03:21:52 -0000 1.3 @@ -9,9 +9,9 @@ import java.io.File; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.nativelib.ArgumentList; import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.tools.todo.taskdefs.MatchingTask; -import org.apache.myrmidon.framework.nativelib.ArgumentList; import org.apache.tools.todo.types.DirectoryScanner; /** 1.3 +6 -6 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/file/CopyTask.java Index: CopyTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/file/CopyTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CopyTask.java 24 May 2002 04:30:59 -0000 1.2 +++ CopyTask.java 5 Jul 2002 03:21:52 -0000 1.3 @@ -438,10 +438,10 @@ / private void displayFilecountNotice( final int count ) { - final String message = - REZ.getString( "copy.file-count.notice", - new Integer( count ), - m_destDir.getAbsolutePath() ); - getContext().info( message ); + final String message = + REZ.getString( "copy.file-count.notice", + new Integer( count ), + m_destDir.getAbsolutePath() ); + getContext().info( message ); } } 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/ExternalCompilerAdaptor.java Index: ExternalCompilerAdaptor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/ExternalCompilerAdaptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExternalCompilerAdaptor.java 14 Apr 2002 10:56:03 -0000 1.1 +++ ExternalCompilerAdaptor.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -9,8 +9,8 @@ import java.io.File; import java.io.FileWriter; -import java.io.PrintWriter; import java.io.IOException; +import java.io.PrintWriter; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.nativelib.Execute; 1.5 +8 -8 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavaCompilerAdaptor.java Index: JavaCompilerAdaptor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavaCompilerAdaptor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- JavaCompilerAdaptor.java 29 May 2002 13:03:31 -0000 1.4 +++ JavaCompilerAdaptor.java 5 Jul 2002 03:21:52 -0000 1.5 @@ -170,12 +170,12 @@ // Log final String message = "Compiling " + compileList.length + " source files to " + m_destDir; getContext().info( message ); - getContext().verbose( "Compiling the following files:" ); - for( int i = 0; i < compileList.length; i++ ) - { - final File file = compileList[ i ]; - getContext().verbose( file.getAbsolutePath() ); - } + getContext().verbose( "Compiling the following files:" ); + for( int i = 0; i < compileList.length; i++ ) + { + final File file = compileList[ i ]; + getContext().verbose( file.getAbsolutePath() ); + } } /* @@ -216,7 +216,7 @@ for( int i = 0; i < newFiles.length; i++ ) { - final File file = newFiles[i ]; + final File file = newFiles[ i ]; acceptedFiles.add( file ); } } 1.2 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavaTask.java Index: JavaTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavaTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JavaTask.java 14 Apr 2002 10:56:03 -0000 1.1 +++ JavaTask.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -10,10 +10,10 @@ import java.io.File; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.myrmidon.framework.nativelib.Argument; import org.apache.myrmidon.framework.nativelib.EnvironmentVariable; -import org.apache.myrmidon.framework.file.Path; /** * This task acts as a loader for java applications but allows to use the same 1.2 +5 -6 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavacAdaptor.java Index: JavacAdaptor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavacAdaptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JavacAdaptor.java 14 Apr 2002 10:56:03 -0000 1.1 +++ JavacAdaptor.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -51,11 +51,11 @@ try { final Object compiler = compilerClass.newInstance(); - final Class[] paramTypes = new Class[] { args.getClass() }; + final Class[] paramTypes = new Class[]{args.getClass()}; final Method compile = compilerClass.getMethod( "compile", paramTypes ); - final Object[] params = new Object[]{ args }; + final Object[] params = new Object[]{args}; final Integer result = (Integer)compile.invoke( compiler, params ); - if( result.intValue() != 0 ) + if( result.intValue() != 0 ) { throw new TaskException( "Javac finished with non-zero return code." ); } @@ -94,7 +94,6 @@ cmd.addArgument( "-d" ); cmd.addArgument( getDestDir() ); - if( isDebug() ) { cmd.addArgument( "-g" ); @@ -107,7 +106,7 @@ // Add the files to compile for( int i = 0; i < files.length; i++ ) { - final File file = files[i ]; + final File file = files[ i ]; cmd.addArgument( file ); } } 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavacTask.java Index: JavacTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JavacTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JavacTask.java 14 Apr 2002 10:56:03 -0000 1.1 +++ JavacTask.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -7,8 +7,8 @@ / package org.apache.antlib.java; -import org.apache.myrmidon.framework.AbstractFacadeTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.AbstractFacadeTask; /* * A task that compiles Java source files. 1.2 +4 -4 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JikesAdaptor.java Index: JikesAdaptor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/java/JikesAdaptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JikesAdaptor.java 14 Apr 2002 10:56:03 -0000 1.1 +++ JikesAdaptor.java 5 Jul 2002 03:21:52 -0000 1.2 @@ -9,10 +9,10 @@ import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; -import org.apache.myrmidon.framework.java.JavaRuntimeClassPath; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.java.JavaRuntimeClassPath; +import org.apache.myrmidon.framework.nativelib.Execute; /** * An adaptor for the jikes compiler. 1.2 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/nativelib/Exec.java Index: Exec.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/nativelib/Exec.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Exec.java 14 Apr 2002 10:56:03 -0000 1.1 +++ Exec.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -12,10 +12,10 @@ import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.myrmidon.framework.nativelib.Argument; import org.apache.myrmidon.framework.nativelib.EnvironmentData; import org.apache.myrmidon.framework.nativelib.EnvironmentVariable; +import org.apache.myrmidon.framework.nativelib.Execute; /** * Executes a native command. 1.6 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/project/AbstractAntTask.java Index: AbstractAntTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/project/AbstractAntTask.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- AbstractAntTask.java 2 Jul 2002 02:50:55 -0000 1.5 +++ AbstractAntTask.java 5 Jul 2002 03:21:53 -0000 1.6 @@ -7,10 +7,10 @@ / package org.apache.antlib.project; +import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.ExecuteTarget; import org.apache.myrmidon.framework.project.AbstractWorkspaceTask; -import java.util.StringTokenizer; /* * Abstract base class for Tasks which execute targets. 1.3 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/project/AntTask.java Index: AntTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/project/AntTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AntTask.java 13 Jun 2002 05:18:59 -0000 1.2 +++ AntTask.java 5 Jul 2002 03:21:53 -0000 1.3 @@ -9,8 +9,8 @@ import java.io.File; import java.net.MalformedURLException; -import org.apache.myrmidon.framework.ExecuteTarget; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.ExecuteTarget; import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; / 1.7 +3 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/project/ProjectRefTask.java Index: ProjectRefTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/project/ProjectRefTask.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ProjectRefTask.java 5 Jul 2002 01:49:52 -0000 1.6 +++ ProjectRefTask.java 5 Jul 2002 03:21:53 -0000 1.7 @@ -12,9 +12,9 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; -import org.apache.myrmidon.interfaces.property.NameValidatorManager; import org.apache.myrmidon.interfaces.property.NameValidator; +import org.apache.myrmidon.interfaces.property.NameValidatorManager; +import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; / * A task that adds a project reference to the current project. 1.2 +6 -6 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/AbstractLibraryClassPath.java Index: AbstractLibraryClassPath.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/AbstractLibraryClassPath.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractLibraryClassPath.java 13 May 2002 09:52:30 -0000 1.1 +++ AbstractLibraryClassPath.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -7,14 +7,14 @@ / package org.apache.antlib.runtime; -import org.apache.myrmidon.framework.file.FileList; +import java.io.File; +import java.net.URL; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.FileList; import org.apache.myrmidon.interfaces.library.Library; -import org.apache.avalon.excalibur.i18n.ResourceManager; -import org.apache.avalon.excalibur.i18n.Resources; -import java.net.URL; -import java.io.File; /* * An abstract FileList implementation, that evaluates to the class-path for 1.9 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/ConverterDef.java Index: ConverterDef.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/ConverterDef.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ConverterDef.java 24 Jun 2002 01:50:03 -0000 1.8 +++ ConverterDef.java 5 Jul 2002 03:21:53 -0000 1.9 @@ -9,12 +9,12 @@ import java.util.HashMap; import java.util.Map; +import org.apache.excalibur.converter.Converter; import org.apache.myrmidon.framework.AbstractTypeDef; import org.apache.myrmidon.interfaces.deployer.Deployer; import org.apache.myrmidon.interfaces.deployer.TypeDefinition; import org.apache.myrmidon.interfaces.library.Library; import org.apache.myrmidon.interfaces.type.ClassLoaderTypeFactory; -import org.apache.excalibur.converter.Converter; /** * Task to define a converter. 1.2 +3 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/RootLibraryClassPath.java Index: RootLibraryClassPath.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/RootLibraryClassPath.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RootLibraryClassPath.java 13 May 2002 09:52:30 -0000 1.1 +++ RootLibraryClassPath.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -7,10 +7,10 @@ / package org.apache.antlib.runtime; -import org.apache.myrmidon.interfaces.library.Library; -import org.apache.myrmidon.interfaces.library.LibraryManager; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.interfaces.library.Library; +import org.apache.myrmidon.interfaces.library.LibraryManager; /* * A FileList that evaluates to the class-path for the root typelib. 1.2 +4 -4 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/TypeLibAvailableCondition.java Index: TypeLibAvailableCondition.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/TypeLibAvailableCondition.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TypeLibAvailableCondition.java 13 May 2002 09:52:30 -0000 1.1 +++ TypeLibAvailableCondition.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -7,12 +7,12 @@ / package org.apache.antlib.runtime; -import org.apache.myrmidon.framework.conditions.Condition; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.conditions.Condition; import org.apache.myrmidon.interfaces.library.LibraryManager; -import org.apache.avalon.excalibur.i18n.ResourceManager; -import org.apache.avalon.excalibur.i18n.Resources; /* * A condition that determines whether a typelib is available. 1.3 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/TypeLibTask.java Index: TypeLibTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/TypeLibTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TypeLibTask.java 12 May 2002 12:57:54 -0000 1.2 +++ TypeLibTask.java 5 Jul 2002 03:21:53 -0000 1.3 @@ -53,6 +53,6 @@ protected Library getLibrary() throws Exception { final LibraryManager libraryManager = (LibraryManager)getService( LibraryManager.class ); - return libraryManager.createLibrary( new File[] { m_lib } ); + return libraryManager.createLibrary( new File[]{m_lib} ); } } 1.2 +0 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/security/GenerateKey.java Index: GenerateKey.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/security/GenerateKey.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GenerateKey.java 14 Apr 2002 10:56:38 -0000 1.1 +++ GenerateKey.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -10,7 +10,6 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.nativelib.Execute; -import org.apache.myrmidon.framework.nativelib.Commandline; /** * Generates a key. 1.2 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/security/SignJar.java Index: SignJar.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/security/SignJar.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SignJar.java 14 Apr 2002 10:56:38 -0000 1.1 +++ SignJar.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -15,8 +15,8 @@ import java.util.zip.ZipFile; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.myrmidon.framework.FileSet; +import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; 1.5 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/sound/SoundTask.java Index: SoundTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/sound/SoundTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SoundTask.java 21 May 2002 05:49:12 -0000 1.4 +++ SoundTask.java 5 Jul 2002 03:21:53 -0000 1.5 @@ -14,8 +14,8 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.interfaces.event.TaskEventManager; import org.apache.myrmidon.framework.listener.TaskToProjectListenerAdapter; +import org.apache.myrmidon.interfaces.event.TaskEventManager; /** * This is an example of an AntTask that makes of use of the AntSoundPlayer. 1.3 +3 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/template/AttributeAdapter.java Index: AttributeAdapter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/template/AttributeAdapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AttributeAdapter.java 2 Jul 2002 10:46:08 -0000 1.2 +++ AttributeAdapter.java 5 Jul 2002 03:21:53 -0000 1.3 @@ -7,9 +7,9 @@ / package org.apache.antlib.template; -import org.apache.myrmidon.api.TaskException; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskException; /* * Simple ant-style task to hold template data. 1.2 +0 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/template/TemplateDefTask.java Index: TemplateDefTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/template/TemplateDefTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TemplateDefTask.java 28 Jun 2002 09:02:07 -0000 1.1 +++ TemplateDefTask.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -65,7 +65,6 @@ m_elements.add( element ); } - public void addLogic( final ModelElement logic ) throws TaskException { 1.3 +3 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/template/TemplateTaskFactory.java Index: TemplateTaskFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/template/TemplateTaskFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TemplateTaskFactory.java 4 Jul 2002 13:12:21 -0000 1.2 +++ TemplateTaskFactory.java 5 Jul 2002 03:21:53 -0000 1.3 @@ -7,8 +7,8 @@ / package org.apache.antlib.template; -import org.apache.myrmidon.interfaces.type.TypeFactory; import org.apache.myrmidon.interfaces.type.TypeException; +import org.apache.myrmidon.interfaces.type.TypeFactory; /* * A {@link TypeFactory} that creates template tasks. @@ -23,7 +23,7 @@ private final TemplateDef m_templateDef; TemplateTaskFactory( final String name, - final TemplateDef templateDef ) + final TemplateDef templateDef ) { if( null == name ) { 1.3 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/CopyFilesTask.java Index: CopyFilesTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/CopyFilesTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CopyFilesTask.java 23 May 2002 01:50:24 -0000 1.2 +++ CopyFilesTask.java 5 Jul 2002 03:21:53 -0000 1.3 @@ -9,11 +9,11 @@ import java.util.ArrayList; import java.util.Iterator; +import org.apache.aut.vfs.FileConstants; import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileType; import org.apache.aut.vfs.NameScope; -import org.apache.aut.vfs.FileConstants; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/ListFileSetTask.java Index: ListFileSetTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/ListFileSetTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ListFileSetTask.java 14 Apr 2002 10:56:19 -0000 1.1 +++ ListFileSetTask.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -39,7 +39,7 @@ final int count = m_fileSets.size(); for( int i = 0; i < count; i++ ) { - final FileSet fileSet = (FileSet)m_fileSets.get(i ); + final FileSet fileSet = (FileSet)m_fileSets.get( i ); FileSetResult result = fileSet.getResult( getContext() ); final FileObject[] files = result.getFiles(); final String[] paths = result.getPaths(); 1.2 +3 -3 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/MappedFileSet.java Index: MappedFileSet.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/vfile/MappedFileSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MappedFileSet.java 14 Apr 2002 10:56:19 -0000 1.1 +++ MappedFileSet.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -55,7 +55,7 @@ final int count = m_filesets.size(); for( int i = 0; i < count; i++ ) { - final FileSet fileSet = (FileSet)m_filesets.get(i ); + final FileSet fileSet = (FileSet)m_filesets.get( i ); mapFileSet( fileSet, result, context ); } @@ -87,7 +87,7 @@ } for( int j = 0; j < newPaths.length; j++ ) { - String newPath = newPaths[j ]; + String newPath = newPaths[ j ]; result.addElement( file, newPath ); } } 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/xml/XMLValidateTask.java Index: XMLValidateTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/xml/XMLValidateTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLValidateTask.java 14 Apr 2002 10:56:39 -0000 1.1 +++ XMLValidateTask.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -15,9 +15,9 @@ import java.util.Hashtable; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.file.Path; -import org.apache.myrmidon.framework.file.FileListUtil; import org.apache.myrmidon.framework.FileSet; +import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; import org.xml.sax.EntityResolver; 1.2 +1 -1 jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/xml/XSLTProcess.java Index: XSLTProcess.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/xml/XSLTProcess.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XSLTProcess.java 14 Apr 2002 10:56:39 -0000 1.1 +++ XSLTProcess.java 5 Jul 2002 03:21:53 -0000 1.2 @@ -23,8 +23,8 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.AbstractMatchingTask; import org.apache.myrmidon.framework.FileSet; -import org.apache.tools.todo.types.DirectoryScanner; import org.apache.myrmidon.framework.file.Path; +import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; /** 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/AbstractLoadPropertiesTaskTestCase.java Index: AbstractLoadPropertiesTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/AbstractLoadPropertiesTaskTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractLoadPropertiesTaskTestCase.java 15 May 2002 10:11:54 -0000 1.1 +++ AbstractLoadPropertiesTaskTestCase.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -7,9 +7,9 @@ / package org.apache.antlib.core.test; +import java.io.File; import org.apache.antlib.AbstractProjectTestCase; import org.apache.myrmidon.LogMessageTracker; -import java.io.File; /* * General purpose test case for property load tasks. 1.5 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/IfTestCase.java Index: IfTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/IfTestCase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- IfTestCase.java 12 May 2002 04:03:32 -0000 1.4 +++ IfTestCase.java 5 Jul 2002 03:21:54 -0000 1.5 @@ -102,7 +102,7 @@ // Check for too many conditions message = REZ.getString( "if.ifelse-duplicate.error" ); - String[] messages = { null, message }; + String[] messages = {null, message}; // 2 condition attributes. executeTargetExpectError( projectFile, "too-many-conditions", messages ); 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/IncludeTaskTestCase.java Index: IncludeTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/IncludeTaskTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IncludeTaskTestCase.java 26 Jun 2002 02:12:36 -0000 1.1 +++ IncludeTaskTestCase.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -7,8 +7,8 @@ / package org.apache.antlib.core.test; -import org.apache.antlib.AbstractProjectTestCase; import java.io.File; +import org.apache.antlib.AbstractProjectTestCase; /* * Test cases for the <include> task. 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/LoadDOMTaskTestCase.java Index: LoadDOMTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/LoadDOMTaskTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LoadDOMTaskTestCase.java 26 Jun 2002 02:12:36 -0000 1.1 +++ LoadDOMTaskTestCase.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -7,8 +7,8 @@ / package org.apache.antlib.core.test; -import org.apache.antlib.AbstractProjectTestCase; import java.io.File; +import org.apache.antlib.AbstractProjectTestCase; /* * Test cases for the <load-dom> task. 1.5 +4 -3 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/PropertyTestCase.java Index: PropertyTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/core/test/PropertyTestCase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PropertyTestCase.java 12 May 2002 04:03:32 -0000 1.4 +++ PropertyTestCase.java 5 Jul 2002 03:21:54 -0000 1.5 @@ -11,6 +11,7 @@ import org.apache.antlib.AbstractProjectTestCase; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.LogMessageTracker; + //import org.apache.myrmidon.components.workspace.DefaultTaskContext; //import org.apache.myrmidon.components.store.DefaultPropertyStore; @@ -73,7 +74,7 @@ // Too many values message = REZ.getString( "property.multi-set.error" ); - String[] messages = { null, message }; + String[] messages = {null, message}; executeTargetExpectError( projectFile, "too-many-values1", messages ); executeTargetExpectError( projectFile, "too-many-values2", messages ); executeTargetExpectError( projectFile, "too-many-values3", messages ); @@ -90,7 +91,7 @@ final File projectFile = getTestResource( "property.ant" ); final Resources rez = null; - //ResourceManager.getPackageResources( DefaultPropertyStore.class ); + //ResourceManager.getPackageResources( DefaultPropertyStore.class ); // Invalid names String message = rez.getString( "bad-property-name.error", "badname!" ); 1.3 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/project/test/AntCallTaskTestCase.java Index: AntCallTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/project/test/AntCallTaskTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AntCallTaskTestCase.java 2 Jul 2002 02:50:55 -0000 1.2 +++ AntCallTaskTestCase.java 5 Jul 2002 03:21:54 -0000 1.3 @@ -7,8 +7,8 @@ / package org.apache.antlib.project.test; -import org.apache.antlib.AbstractProjectTestCase; import java.io.File; +import org.apache.antlib.AbstractProjectTestCase; /* * Test cases for the <ant-call> task. 1.3 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/project/test/AntTaskTestCase.java Index: AntTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/project/test/AntTaskTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AntTaskTestCase.java 2 Jul 2002 02:50:55 -0000 1.2 +++ AntTaskTestCase.java 5 Jul 2002 03:21:54 -0000 1.3 @@ -7,8 +7,8 @@ / package org.apache.antlib.project.test; -import org.apache.antlib.AbstractProjectTestCase; import java.io.File; +import org.apache.antlib.AbstractProjectTestCase; /* * Test cases for the <ant> task. 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/project/test/ProjectRefTaskTestCase.java Index: ProjectRefTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/project/test/ProjectRefTaskTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ProjectRefTaskTestCase.java 27 Jun 2002 11:13:08 -0000 1.1 +++ ProjectRefTaskTestCase.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -7,8 +7,8 @@ / package org.apache.antlib.project.test; -import org.apache.antlib.AbstractProjectTestCase; import java.io.File; +import org.apache.antlib.AbstractProjectTestCase; /* * Test cases for the <projectref> task. 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/AbstractTypeDefTestCase.java Index: AbstractTypeDefTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/AbstractTypeDefTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractTypeDefTestCase.java 22 May 2002 07:36:21 -0000 1.1 +++ AbstractTypeDefTestCase.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -7,10 +7,10 @@ / package org.apache.antlib.runtime.test; +import java.io.File; import org.apache.antlib.AbstractProjectTestCase; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.framework.AbstractTypeDef; -import java.io.File; /* * General purpose test cases for type-def tasks that extend AbstractTypeDef. 1.3 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/TypeAvailableConditionTestCase.java Index: TypeAvailableConditionTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/TypeAvailableConditionTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TypeAvailableConditionTestCase.java 25 Jun 2002 07:35:31 -0000 1.2 +++ TypeAvailableConditionTestCase.java 5 Jul 2002 03:21:54 -0000 1.3 @@ -7,8 +7,8 @@ / package org.apache.antlib.runtime.test; -import org.apache.antlib.AbstractProjectTestCase; import java.io.File; +import org.apache.antlib.AbstractProjectTestCase; /* * Test cases for the <type-available> condition. 1.2 +2 -2 jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/TypeDefTestFileList.java Index: TypeDefTestFileList.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/runtime/test/TypeDefTestFileList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TypeDefTestFileList.java 23 May 2002 09:33:50 -0000 1.1 +++ TypeDefTestFileList.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -34,6 +34,6 @@ public String[] listFiles( final TaskContext context ) throws TaskException { - return new String[] { m_file.getAbsolutePath() }; + return new String[]{m_file.getAbsolutePath()}; } } 1.2 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/OsFamily.java Index: OsFamily.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/nativelib/OsFamily.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- OsFamily.java 2 Mar 2002 04:03:36 -0000 1.1 +++ OsFamily.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -21,7 +21,7 @@ OsFamily( final String name ) { m_name = name; - m_families = new OsFamily[0]; + m_families = new OsFamily[ 0 ]; } OsFamily( final String name, final OsFamily[] families ) 1.6 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileObject.java Index: FileObject.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/FileObject.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- FileObject.java 17 Jun 2002 00:06:16 -0000 1.5 +++ FileObject.java 5 Jul 2002 03:21:54 -0000 1.6 @@ -8,8 +8,8 @@ package org.apache.aut.vfs; import java.io.File; -import java.net.URL; import java.net.MalformedURLException; +import java.net.URL; /** * This interface represents a file, and is used to access the content and 1.10 +3 -3 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java Index: DefaultFileSystemManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DefaultFileSystemManager.java 17 Jun 2002 07:19:45 -0000 1.9 +++ DefaultFileSystemManager.java 5 Jul 2002 03:21:54 -0000 1.10 @@ -19,8 +19,8 @@ import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.FileSystemManager; import org.apache.aut.vfs.provider.DefaultURLStreamHandler; -import org.apache.aut.vfs.provider.FileReplicator; import org.apache.aut.vfs.provider.FileProvider; +import org.apache.aut.vfs.provider.FileReplicator; import org.apache.aut.vfs.provider.LocalFileProvider; import org.apache.aut.vfs.provider.UriParser; import org.apache.avalon.excalibur.i18n.ResourceManager; @@ -278,7 +278,7 @@ / public URLStreamHandlerFactory getURLStreamHandlerFactory() { - return new VfsStreamHandlerFactory(); + return new VfsStreamHandlerFactory(); } // This is an internal class because it needs access to the private member m_providers. 1.4 +2 -1 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultProviderContext.java Index: DefaultProviderContext.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/DefaultProviderContext.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DefaultProviderContext.java 17 Jun 2002 00:06:16 -0000 1.3 +++ DefaultProviderContext.java 5 Jul 2002 03:21:54 -0000 1.4 @@ -45,6 +45,7 @@ { return m_manager.resolveFile( name ); } + /* * Locates a file replicator for the provider to use. / 1.2 +7 -6 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/URLStreamHandlerProxy.java Index: URLStreamHandlerProxy.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/impl/URLStreamHandlerProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- URLStreamHandlerProxy.java 17 Jun 2002 00:06:16 -0000 1.1 +++ URLStreamHandlerProxy.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -8,10 +8,10 @@ package org.apache.aut.vfs.impl; import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; -import java.net.MalformedURLException; /* * A proxy for URLs that are supported by the standard stream handler factory. @@ -32,7 +32,8 @@ protected void parseURL( URL u, String spec, int start, int limit ) { - try{ + try + { URL url = new URL( u, spec ); setURL( u, url.getProtocol(), url.getHost(), url.getPort(), url.getAuthority(), url.getUserInfo(), @@ -40,9 +41,9 @@ } catch( MalformedURLException mue ) { - //We retrow this as a simple runtime exception. - //It is retrown in URL as a MalformedURLException anyway. - throw new RuntimeException( mue.getMessage() ); + //We retrow this as a simple runtime exception. + //It is retrown in URL as a MalformedURLException anyway. + throw new RuntimeException( mue.getMessage() ); } } } 1.10 +4 -5 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java Index: AbstractFileObject.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- AbstractFileObject.java 17 Jun 2002 00:06:16 -0000 1.9 +++ AbstractFileObject.java 5 Jul 2002 03:21:54 -0000 1.10 @@ -10,11 +10,10 @@ import java.io.File; import java.io.InputStream; import java.io.OutputStream; +import java.net.MalformedURLException; +import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.net.URL; -import java.net.MalformedURLException; -import java.net.URLStreamHandler; import org.apache.aut.vfs.FileConstants; import org.apache.aut.vfs.FileContent; import org.apache.aut.vfs.FileName; @@ -222,7 +221,7 @@ public URL getURL() throws MalformedURLException { StringBuffer buf = new StringBuffer(); - + return new URL( UriParser.extractScheme( m_name.getURI(), buf ), null, -1, buf.toString(), new DefaultURLStreamHandler( m_fs.getContext() ) ); } 1.2 +10 -5 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLConnection.java Index: DefaultURLConnection.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLConnection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultURLConnection.java 17 Jun 2002 00:06:16 -0000 1.1 +++ DefaultURLConnection.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -41,7 +41,8 @@ public InputStream getInputStream() throws IOException { - try{ + try + { return m_content.getInputStream(); } catch( FileSystemException fse ) @@ -53,7 +54,8 @@ public OutputStream getOutputStream() throws IOException { - try{ + try + { return m_content.getOutputStream(); } catch( FileSystemException fse ) @@ -64,10 +66,13 @@ public int getContentLength() { - try{ + try + { return (int)m_content.getSize(); } - catch( FileSystemException fse ) {} + catch( FileSystemException fse ) + { + } return -1; } 1.2 +7 -5 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLStreamHandler.java Index: DefaultURLStreamHandler.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/DefaultURLStreamHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultURLStreamHandler.java 17 Jun 2002 00:06:16 -0000 1.1 +++ DefaultURLStreamHandler.java 5 Jul 2002 03:21:54 -0000 1.2 @@ -27,7 +27,7 @@ FileSystemProviderContext m_context; - public DefaultURLStreamHandler( FileSystemProviderContext context ) + public DefaultURLStreamHandler( FileSystemProviderContext context ) { m_context = context; } @@ -35,7 +35,8 @@ protected URLConnection openConnection( URL url ) throws IOException { - try{ + try + { FileObject entry = m_context.resolveFile( url.toExternalForm() ); return new DefaultURLConnection( url, entry.getContent() ); } @@ -47,13 +48,14 @@ protected void parseURL( URL u, String spec, int start, int limit ) { - try{ + try + { FileObject old = null; if( u.getProtocol() != null ) old = m_context.resolveFile( u.toExternalForm() ); FileObject newURL = null; - if( start > 0 && spec.charAt( start-1 ) == ':' ) + if( start > 0 && spec.charAt( start - 1 ) == ':' ) newURL = m_context.resolveFile( old, spec ); else newURL = old.resolveFile( spec ); 1.6 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java Index: SmbFileSystemProvider.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/smb/SmbFileSystemProvider.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SmbFileSystemProvider.java 17 Jun 2002 07:19:45 -0000 1.5 +++ SmbFileSystemProvider.java 5 Jul 2002 03:21:54 -0000 1.6 @@ -12,8 +12,8 @@ import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.provider.AbstractFileSystemProvider; import org.apache.aut.vfs.provider.DefaultFileName; -import org.apache.aut.vfs.provider.FileSystem; import org.apache.aut.vfs.provider.FileProvider; +import org.apache.aut.vfs.provider.FileSystem; import org.apache.aut.vfs.provider.ParsedUri; / 1.6 +2 -2 jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java Index: ZipFileSystemProvider.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystemProvider.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ZipFileSystemProvider.java 17 Jun 2002 07:19:46 -0000 1.5 +++ ZipFileSystemProvider.java 5 Jul 2002 03:21:54 -0000 1.6 @@ -13,8 +13,8 @@ import org.apache.aut.vfs.FileSystemException; import org.apache.aut.vfs.provider.AbstractFileSystemProvider; import org.apache.aut.vfs.provider.DefaultFileName; -import org.apache.aut.vfs.provider.FileSystem; import org.apache.aut.vfs.provider.FileProvider; +import org.apache.aut.vfs.provider.FileSystem; import org.apache.aut.vfs.provider.ParsedUri; / 1.4 +3 -3 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/AbstractAutTestCase.java Index: AbstractAutTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/AbstractAutTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractAutTestCase.java 7 Jun 2002 05:35:18 -0000 1.3 +++ AbstractAutTestCase.java 5 Jul 2002 03:21:54 -0000 1.4 @@ -10,11 +10,11 @@ import java.io.File; import java.io.IOException; import junit.framework.TestCase; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.ExceptionUtil; -import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.logger.ConsoleLogger; +import org.apache.avalon.framework.logger.Logger; /** * A base class for Myrmidon tests. Provides utility methods for locating 1.2 +1 -1 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/ftp/test/FtpFileSystemTestCase.java Index: FtpFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/ftp/test/FtpFileSystemTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FtpFileSystemTestCase.java 13 Apr 2002 04:30:57 -0000 1.1 +++ FtpFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.2 @@ -7,9 +7,9 @@ / package org.apache.aut.vfs.provider.ftp.test; +import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.provider.ftp.FtpFileSystemProvider; import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; -import org.apache.aut.vfs.FileObject; /* * Tests for FTP file systems. 1.3 +1 -1 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/local/test/LocalFileSystemTestCase.java Index: LocalFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/local/test/LocalFileSystemTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- LocalFileSystemTestCase.java 7 Jun 2002 01:48:39 -0000 1.2 +++ LocalFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.3 @@ -8,8 +8,8 @@ package org.apache.aut.vfs.provider.local.test; import java.io.File; -import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; import org.apache.aut.vfs.FileObject; +import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; /** * Tests for the local file system. 1.2 +1 -1 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/smb/test/SmbFileSystemTestCase.java Index: SmbFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/smb/test/SmbFileSystemTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SmbFileSystemTestCase.java 13 Apr 2002 04:30:57 -0000 1.1 +++ SmbFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.2 @@ -7,9 +7,9 @@ / package org.apache.aut.vfs.provider.smb.test; +import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.provider.smb.SmbFileSystemProvider; import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; -import org.apache.aut.vfs.FileObject; /* * Tests for the SMB file system. 1.2 +1 -1 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/zip/test/NestedZipFileSystemTestCase.java Index: NestedZipFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/zip/test/NestedZipFileSystemTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NestedZipFileSystemTestCase.java 13 Apr 2002 04:30:57 -0000 1.1 +++ NestedZipFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.2 @@ -7,9 +7,9 @@ / package org.apache.aut.vfs.provider.zip.test; +import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.provider.zip.ZipFileSystemProvider; import org.apache.aut.vfs.test.AbstractReadOnlyFileSystemTestCase; -import org.apache.aut.vfs.FileObject; /* * Tests for the Zip file system, using a zip file nested inside another zip file. 1.2 +1 -1 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/zip/test/ZipFileSystemTestCase.java Index: ZipFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/provider/zip/test/ZipFileSystemTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ZipFileSystemTestCase.java 13 Apr 2002 04:30:57 -0000 1.1 +++ ZipFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.2 @@ -8,9 +8,9 @@ package org.apache.aut.vfs.provider.zip.test; import java.io.File; +import org.apache.aut.vfs.FileObject; import org.apache.aut.vfs.provider.zip.ZipFileSystemProvider; import org.apache.aut.vfs.test.AbstractReadOnlyFileSystemTestCase; -import org.apache.aut.vfs.FileObject; /** * Tests for the Zip file system. 1.9 +5 -5 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java Index: AbstractFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- AbstractFileSystemTestCase.java 17 Jun 2002 00:06:16 -0000 1.8 +++ AbstractFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.9 @@ -8,10 +8,10 @@ package org.apache.aut.vfs.test; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.IOException; -import java.net.URLConnection; +import java.io.InputStream; import java.net.URL; +import java.net.URLConnection; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -750,11 +750,11 @@ { FileObject file = m_baseFolder.resolveFile( "some-dir/" ); URL url = file.getURL(); - + assertEquals( file.getName().getURI(), url.toExternalForm() ); URL parentURL = new URL( url, ".." ); - assertEquals( m_baseFolder.getURL(), parentURL ); + assertEquals( m_baseFolder.getURL(), parentURL ); URL rootURL = new URL( url, "/" ); assertEquals( file.getRoot().getURL(), rootURL ); 1.2 +0 -2 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java Index: AbstractReadOnlyFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractReadOnlyFileSystemTestCase.java 17 Mar 2002 08:06:52 -0000 1.1 +++ AbstractReadOnlyFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.2 @@ -7,8 +7,6 @@ / package org.apache.aut.vfs.test; -import org.apache.aut.vfs.test.AbstractFileSystemTestCase; - /* * File system tests which check that a read-only file system cannot be * changed. 1.3 +2 -3 jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java Index: AbstractWritableFileSystemTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractWritableFileSystemTestCase.java 7 Apr 2002 02:27:57 -0000 1.2 +++ AbstractWritableFileSystemTestCase.java 5 Jul 2002 03:21:55 -0000 1.3 @@ -10,11 +10,10 @@ import java.io.OutputStream; import java.util.HashSet; import java.util.Set; -import org.apache.aut.vfs.test.AbstractFileSystemTestCase; +import org.apache.aut.vfs.FileConstants; import org.apache.aut.vfs.FileObject; -import org.apache.aut.vfs.FileType; import org.apache.aut.vfs.FileSystemException; -import org.apache.aut.vfs.FileConstants; +import org.apache.aut.vfs.FileType; /** * File system test that check that a file system can be modified. 1.3 +3 -3 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocNestedTypeSubTask.java Index: AntDocNestedTypeSubTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocNestedTypeSubTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AntDocNestedTypeSubTask.java 25 Jun 2002 00:40:25 -0000 1.2 +++ AntDocNestedTypeSubTask.java 5 Jul 2002 03:21:55 -0000 1.3 @@ -7,10 +7,10 @@ / package org.apache.myrmidon.build; -import java.util.Map; import java.net.URL; -import xjavadoc.XClass; +import java.util.Map; import xdoclet.XDocletException; +import xjavadoc.XClass; /* * Generates documentation for classes used as nested elements. 1.4 +2 -2 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocTypeSubTask.java Index: AntDocTypeSubTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocTypeSubTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AntDocTypeSubTask.java 25 Jun 2002 00:40:25 -0000 1.3 +++ AntDocTypeSubTask.java 5 Jul 2002 03:21:55 -0000 1.4 @@ -8,8 +8,8 @@ package org.apache.myrmidon.build; import java.net.URL; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import xdoclet.XDocletException; import xjavadoc.XClass; 1.3 +2 -2 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntTypeSubTask.java Index: AntTypeSubTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntTypeSubTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AntTypeSubTask.java 12 Jun 2002 06:51:04 -0000 1.2 +++ AntTypeSubTask.java 5 Jul 2002 03:21:55 -0000 1.3 @@ -7,10 +7,10 @@ / package org.apache.myrmidon.build; +import java.util.Map; import xdoclet.TemplateSubTask; import xdoclet.XDocletException; import xdoclet.template.TemplateException; -import java.util.Map; /* * A subtask that deals with ant type tags. 1.6 +9 -9 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntTypeTagHandler.java Index: AntTypeTagHandler.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntTypeTagHandler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- AntTypeTagHandler.java 25 Jun 2002 07:08:10 -0000 1.5 +++ AntTypeTagHandler.java 5 Jul 2002 03:21:55 -0000 1.6 @@ -8,15 +8,15 @@ package org.apache.myrmidon.build; import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import xdoclet.XDocletException; import xdoclet.XDocletTagSupport; import xjavadoc.XClass; -import xjavadoc.XTag; import xjavadoc.XMethod; import xjavadoc.XParameter; +import xjavadoc.XTag; /** * Handler for Ant xdoclet tags. @@ -156,10 +156,10 @@ { buffer.setCharAt( i, Character.toUpperCase( buffer.charAt( i ) ) ); } - else if( buffer.charAt( i ) == '-' && i < length-1 ) + else if( buffer.charAt( i ) == '-' && i < length - 1 ) { buffer.setCharAt( i, ' ' ); - buffer.setCharAt( i+1, Character.toUpperCase( buffer.charAt( i+1 ) ) ); + buffer.setCharAt( i + 1, Character.toUpperCase( buffer.charAt( i + 1 ) ) ); } } return buffer.toString(); @@ -294,14 +294,14 @@ if( !method.isPublic() \|\| method.isStatic() \|\| !method.getReturnType().getQualifiedName().equals( "void" ) - \|\| (exactMatch && ! method.getName().equals( name ) ) - \|\| (!exactMatch && !method.getName().startsWith( name ) ) ) + \|\| ( exactMatch && !method.getName().equals( name ) ) + \|\| ( !exactMatch && !method.getName().startsWith( name ) ) ) { continue; } final XParameter[] params = method.getParameters(); if( params.length != 1 - \|\| params[0].getDimension() > 0 ) + \|\| params[ 0 ].getDimension() > 0 ) { continue; } 1.2 +4 -4 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntlibJarTask.java Index: AntlibJarTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntlibJarTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AntlibJarTask.java 14 Apr 2002 11:16:17 -0000 1.1 +++ AntlibJarTask.java 5 Jul 2002 03:21:55 -0000 1.2 @@ -7,10 +7,10 @@ / package org.apache.myrmidon.build; +import java.io.File; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.Jar; import org.apache.tools.ant.types.ZipFileSet; -import org.apache.tools.ant.BuildException; -import java.io.File; /* * An Ant 1.x task to assemble a Myrmidon Antlib. @@ -55,7 +55,7 @@ { return; } - if( ! file.isFile() ) + if( !file.isFile() ) { throw new BuildException( "File \"" + file + "\" does not exist or is not a file." ); } 1.3 +2 -2 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/NameUtil.java Index: NameUtil.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/NameUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NameUtil.java 11 Jun 2002 11:47:04 -0000 1.2 +++ NameUtil.java 5 Jul 2002 03:21:55 -0000 1.3 @@ -60,7 +60,7 @@ public static String toXMLStyle( final String value ) { final int size = value.length(); - final StringBuffer sb = new StringBuffer( (int)(size * 1.5) ); + final StringBuffer sb = new StringBuffer( (int)( size * 1.5 ) ); for( int i = 0; i < size; i++ ) { 1.2 +0 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/ATIModelBuilder.java Index: ATIModelBuilder.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/ATIModelBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ATIModelBuilder.java 13 Jun 2002 07:32:26 -0000 1.1 +++ ATIModelBuilder.java 5 Jul 2002 03:21:55 -0000 1.2 @@ -9,8 +9,6 @@ import org.apache.myrmidon.api.metadata.ModelElement; import org.apache.myrmidon.api.metadata.ModelException; -import org.apache.myrmidon.components.builder.DefaultModelBuilder; -import org.apache.myrmidon.components.builder.TransformingModelBuilder; import org.apache.myrmidon.components.builder.ati.XMLBuilderUtil; import org.apache.myrmidon.interfaces.builder.ModelBuilder; 1.18 +1 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java Index: ATIProjectBuilder.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ATIProjectBuilder.java 13 Jun 2002 07:32:59 -0000 1.17 +++ ATIProjectBuilder.java 5 Jul 2002 03:21:55 -0000 1.18 @@ -7,7 +7,6 @@ / package org.apache.myrmidon.components.builder; -import org.apache.myrmidon.components.builder.DefaultProjectBuilder; import org.apache.myrmidon.interfaces.builder.ModelBuilder; /* 1.5 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultModelBuilder.java Index: DefaultModelBuilder.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultModelBuilder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultModelBuilder.java 13 Jun 2002 02:52:50 -0000 1.4 +++ DefaultModelBuilder.java 5 Jul 2002 03:21:55 -0000 1.5 @@ -9,11 +9,11 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.metadata.ModelElement; import org.apache.myrmidon.api.metadata.ModelException; import org.apache.myrmidon.interfaces.builder.ModelBuilder; -import org.apache.avalon.excalibur.i18n.ResourceManager; -import org.apache.avalon.excalibur.i18n.Resources; import org.xml.sax.XMLReader; / 1.86 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java Index: DefaultProjectBuilder.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- DefaultProjectBuilder.java 2 Jul 2002 12:32:34 -0000 1.85 +++ DefaultProjectBuilder.java 5 Jul 2002 03:21:55 -0000 1.86 @@ -275,7 +275,7 @@ final ModelElement[] children = model.getChildren(); implicit.addChildren( children ); - return new Target[] { createTarget( implicit ) }; + return new Target[]{createTarget( implicit )}; } / 1.10 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java Index: ConfigurationState.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ConfigurationState.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ConfigurationState.java 25 Jun 2002 00:35:20 -0000 1.9 +++ ConfigurationState.java 5 Jul 2002 03:21:56 -0000 1.10 @@ -20,7 +20,7 @@ private final Object m_object; ConfigurationState( final ObjectConfigurer configurer, - final Object object ) + final Object object ) { m_configurer = configurer; m_object = object; 1.14 +8 -8 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ObjectConfigurer.java Index: ObjectConfigurer.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ObjectConfigurer.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ObjectConfigurer.java 25 Jun 2002 07:10:01 -0000 1.13 +++ ObjectConfigurer.java 5 Jul 2002 03:21:56 -0000 1.14 @@ -17,8 +17,8 @@ import java.util.Map; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.myrmidon.api.metadata.ModelException; import org.apache.myrmidon.api.metadata.ModelElement; +import org.apache.myrmidon.api.metadata.ModelException; /** * An object configurer which uses reflection to determine the properties @@ -264,12 +264,12 @@ } /** - * Returns a configurer for a atribute property of this class. - * - * @param name The attribute name. - * @return A configurer for the property, or null if the property is not - * valid for this class. - / + Returns a configurer for a atribute property of this class. + * + * @param name The attribute name. + * @return A configurer for the property, or null if the property is not + * valid for this class. + / public PropertyConfigurer getSetter( final String name ) { return (PropertyConfigurer)m_setters.get( name ); 1.7 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/event/DefaultTaskEventManager.java Index: DefaultTaskEventManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/event/DefaultTaskEventManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DefaultTaskEventManager.java 4 Jul 2002 08:20:54 -0000 1.6 +++ DefaultTaskEventManager.java 5 Jul 2002 03:21:56 -0000 1.7 @@ -7,11 +7,11 @@ / package org.apache.myrmidon.components.event; +import java.util.ArrayList; +import java.util.List; import org.apache.myrmidon.api.event.TaskEvent; import org.apache.myrmidon.api.event.TaskListener; import org.apache.myrmidon.interfaces.event.TaskEventManager; -import java.util.List; -import java.util.ArrayList; /** * Support for the task listener event dispatching. 1.2 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/extensions/ExtensionRepository.java Index: ExtensionRepository.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/extensions/ExtensionRepository.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExtensionRepository.java 10 May 2002 06:27:31 -0000 1.1 +++ ExtensionRepository.java 5 Jul 2002 03:21:56 -0000 1.2 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.components.extensions; -import org.apache.avalon.excalibur.extension.OptionalPackage; -import org.apache.avalon.excalibur.extension.DefaultPackageRepository; import java.io.File; +import org.apache.avalon.excalibur.extension.DefaultPackageRepository; +import org.apache.avalon.excalibur.extension.OptionalPackage; /* * A collection of extensions. This class is a bit of a hack, to make 1.4 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefaultLibrary.java Index: DefaultLibrary.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefaultLibrary.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DefaultLibrary.java 4 Jul 2002 13:17:22 -0000 1.3 +++ DefaultLibrary.java 5 Jul 2002 03:21:56 -0000 1.4 @@ -9,9 +9,9 @@ import java.net.URL; import org.apache.avalon.excalibur.extension.Extension; +import org.apache.myrmidon.interfaces.deployer.TypeDefinition; import org.apache.myrmidon.interfaces.library.Library; import org.apache.myrmidon.interfaces.role.RoleInfo; -import org.apache.myrmidon.interfaces.deployer.TypeDefinition; /** * The default library implementation. 1.13 +3 -4 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefaultLibraryManager.java Index: DefaultLibraryManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefaultLibraryManager.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DefaultLibraryManager.java 4 Jul 2002 13:17:22 -0000 1.12 +++ DefaultLibraryManager.java 5 Jul 2002 03:21:56 -0000 1.13 @@ -15,9 +15,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.List; import java.util.jar.Manifest; import org.apache.aut.nativelib.PathUtil; import org.apache.avalon.excalibur.extension.Extension; @@ -33,10 +33,10 @@ import org.apache.avalon.framework.service.Serviceable; import org.apache.myrmidon.interfaces.ComponentException; import org.apache.myrmidon.interfaces.deployer.TypeDefinition; -import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.extensions.ExtensionManager; import org.apache.myrmidon.interfaces.library.Library; import org.apache.myrmidon.interfaces.library.LibraryManager; +import org.apache.myrmidon.interfaces.role.RoleInfo; /** * The default library manager implementation. @@ -59,7 +59,6 @@ private Library[] m_coreLibraries; private final DefinitionBuilder m_roleBuilder = new RoleDefinitionBuilder(); private final DefinitionBuilder m_typeBuilder = new TypeDefinitionBuilder(); - /** * Map from Jar file to the Library for that file. 1.2 +7 -7 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefinitionBuilder.java Index: DefinitionBuilder.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefinitionBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefinitionBuilder.java 4 Jul 2002 13:17:22 -0000 1.1 +++ DefinitionBuilder.java 5 Jul 2002 03:21:56 -0000 1.2 @@ -7,16 +7,16 @@ / package org.apache.myrmidon.components.library; -import java.util.List; -import java.util.ArrayList; -import java.net.URL; import java.io.FileNotFoundException; -import org.apache.avalon.framework.CascadingException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.myrmidon.interfaces.builder.ModelBuilder; -import org.apache.myrmidon.components.builder.DefaultModelBuilder; +import org.apache.avalon.framework.CascadingException; import org.apache.myrmidon.api.metadata.ModelElement; +import org.apache.myrmidon.components.builder.DefaultModelBuilder; +import org.apache.myrmidon.interfaces.builder.ModelBuilder; /* * Assembles type/role definitions from the descriptors contained in a library. 1.3 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/MultiParentURLClassLoader.java Index: MultiParentURLClassLoader.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/MultiParentURLClassLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MultiParentURLClassLoader.java 23 May 2002 01:50:25 -0000 1.2 +++ MultiParentURLClassLoader.java 5 Jul 2002 03:21:56 -0000 1.3 @@ -13,9 +13,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; +import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.HashSet; /** * A URLClassLoader with more than one parent. 1.5 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultNameValidator.java Index: DefaultNameValidator.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultNameValidator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultNameValidator.java 27 Jun 2002 05:13:34 -0000 1.4 +++ DefaultNameValidator.java 5 Jul 2002 03:21:56 -0000 1.5 @@ -142,8 +142,8 @@ { final String message = REZ.getString( "name.invalid-internal-char.error", - name, - describeValidInternalChars() ); + name, + describeValidInternalChars() ); throw new Exception( message ); } } 1.2 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultNameValidatorManager.java Index: DefaultNameValidatorManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultNameValidatorManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultNameValidatorManager.java 29 May 2002 06:42:26 -0000 1.1 +++ DefaultNameValidatorManager.java 5 Jul 2002 03:21:56 -0000 1.2 @@ -9,10 +9,10 @@ import java.util.HashMap; import java.util.Map; -import org.apache.myrmidon.interfaces.property.NameValidator; -import org.apache.myrmidon.interfaces.property.NameValidatorManager; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.interfaces.property.NameValidator; +import org.apache.myrmidon.interfaces.property.NameValidatorManager; /** * The default name validator manager. 1.4 +5 -5 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/MapPropertyStore.java Index: MapPropertyStore.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/MapPropertyStore.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- MapPropertyStore.java 25 Jun 2002 14:38:28 -0000 1.3 +++ MapPropertyStore.java 5 Jul 2002 03:21:56 -0000 1.4 @@ -7,13 +7,13 @@ / package org.apache.myrmidon.components.property; -import java.util.Map; -import java.util.HashMap; import java.util.Collections; -import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.interfaces.property.PropertyStore; +import java.util.HashMap; +import java.util.Map; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.interfaces.property.PropertyStore; /* * A simple unscoped, unsynchronized property store which is backed by a Map. 1.16 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java Index: InstantiatingServiceManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- InstantiatingServiceManager.java 30 Jun 2002 09:58:14 -0000 1.15 +++ InstantiatingServiceManager.java 5 Jul 2002 03:21:56 -0000 1.16 @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Iterator; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.activity.Disposable; 1.3 +4 -4 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/AbstractTypeFactory.java Index: AbstractTypeFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/AbstractTypeFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractTypeFactory.java 23 Jun 2002 07:47:00 -0000 1.2 +++ AbstractTypeFactory.java 5 Jul 2002 03:21:56 -0000 1.3 @@ -7,10 +7,10 @@ / package org.apache.myrmidon.components.type; -import org.apache.myrmidon.interfaces.type.TypeFactory; -import org.apache.myrmidon.interfaces.type.TypeException; -import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.interfaces.type.TypeException; +import org.apache.myrmidon.interfaces.type.TypeFactory; /* * Abstract TypeFactory. 1.2 +8 -8 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/AggregatingTypeFactory.java Index: AggregatingTypeFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/AggregatingTypeFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AggregatingTypeFactory.java 10 May 2002 01:44:47 -0000 1.1 +++ AggregatingTypeFactory.java 5 Jul 2002 03:21:56 -0000 1.2 @@ -7,13 +7,13 @@ / package org.apache.myrmidon.components.type; -import org.apache.myrmidon.interfaces.type.TypeFactory; -import org.apache.myrmidon.interfaces.type.TypeException; -import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.avalon.excalibur.i18n.ResourceManager; -import java.util.Set; import java.util.HashSet; import java.util.Iterator; +import java.util.Set; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.interfaces.type.TypeException; +import org.apache.myrmidon.interfaces.type.TypeFactory; /* * A TypeFactory implementation which simply aggregates another set of type factories. @@ -50,10 +50,10 @@ while( iter.hasNext() ) { TypeFactory tryFactory = (TypeFactory)iter.next(); - if ( tryFactory.canCreate( name ) ) + if( tryFactory.canCreate( name ) ) { // If we've already found a factory, the name is ambiguous. - if ( factory != null ) + if( factory != null ) { String message = REZ.getString( "ambiguous-type-name.error", name ); 1.32 +2 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java Index: DefaultTypeManager.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- DefaultTypeManager.java 30 Jun 2002 11:09:11 -0000 1.31 +++ DefaultTypeManager.java 5 Jul 2002 03:21:56 -0000 1.32 @@ -10,9 +10,9 @@ import java.util.HashMap; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.interfaces.role.RoleException; import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.role.RoleManager; -import org.apache.myrmidon.interfaces.role.RoleException; import org.apache.myrmidon.interfaces.role.RoleRegistry; import org.apache.myrmidon.interfaces.type.TypeException; import org.apache.myrmidon.interfaces.type.TypeFactory; @@ -97,7 +97,6 @@ { return new DefaultTypeManager( this ); } - /** * Find role based on role type. 1.7 +9 -9 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/NamespaceAwareTypeFactory.java Index: NamespaceAwareTypeFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/NamespaceAwareTypeFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NamespaceAwareTypeFactory.java 23 Jun 2002 07:46:26 -0000 1.6 +++ NamespaceAwareTypeFactory.java 5 Jul 2002 03:21:56 -0000 1.7 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.components.type; +import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.HashMap; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.interfaces.role.RoleInfo; @@ -84,7 +84,7 @@ final TypeFactory newTypes ) { // Use the default namespace if none provided. - if ( namespace == null ) + if( namespace == null ) { namespace = DEFAULT_NAMESPACE; } @@ -122,7 +122,7 @@ throws TypeException { // Type short-names may not contain the namespace separator. - if ( parseName( name ).hasNamespace() ) + if( parseName( name ).hasNamespace() ) { String message = REZ.getString( "invalid-type-name.error", name, String.valueOf( TypeManager.NAMESPACE_SEPARATOR ) ); @@ -130,7 +130,7 @@ } // Use the default namespace if none provided. - if ( namespace == null ) + if( namespace == null ) { namespace = DEFAULT_NAMESPACE; } @@ -195,7 +195,7 @@ { TypeFactory factory = findLocalFactoryUseCache( qname ); - if ( factory == null && m_parent != null ) + if( factory == null && m_parent != null ) { factory = m_parent.findFactory( qname ); } @@ -214,7 +214,7 @@ private TypeFactory findLocalFactoryUseCache( TypeName qname ) throws TypeException { - if ( m_typeFactoryCache.containsKey( qname ) ) + if( m_typeFactoryCache.containsKey( qname ) ) { return (TypeFactory)m_typeFactoryCache.get( qname ); } @@ -242,7 +242,7 @@ { // First search in the individually registered types TypeFactory factory = findLocalFactory( qname, m_multiSourceTypeFactories ); - if ( factory == null ) + if( factory == null ) { // Then in the factory-registered types. factory = findLocalFactory( qname, m_aggregatingTypeFactories ); @@ -286,7 +286,7 @@ if( tryFactory.canCreate( shortName ) ) { // If we've already found a factory, the name is ambiguous. - if ( factory != null ) + if( factory != null ) { String message = REZ.getString( "ambiguous-type-name.error", shortName ); 1.3 +4 -4 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/TypeName.java Index: TypeName.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/type/TypeName.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TypeName.java 9 May 2002 05:09:04 -0000 1.2 +++ TypeName.java 5 Jul 2002 03:21:56 -0000 1.3 @@ -29,7 +29,7 @@ / TypeName( final String typeName ) { - if ( typeName == null ) + if( typeName == null ) { throw new NullPointerException( "typeName" ); } @@ -84,9 +84,9 @@ public boolean equals( Object o ) { - if ( o instanceof TypeName ) + if( o instanceof TypeName ) { - String otherFullName = ((TypeName)o).m_fullName; + String otherFullName = ( (TypeName)o ).m_fullName; return ( otherFullName.equals( m_fullName ) ); } 1.28 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java Index: ProjectEntry.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ProjectEntry.java 5 Jul 2002 01:49:52 -0000 1.27 +++ ProjectEntry.java 5 Jul 2002 03:21:57 -0000 1.28 @@ -17,8 +17,8 @@ import org.apache.myrmidon.interfaces.model.Target; import org.apache.myrmidon.interfaces.property.NameValidator; import org.apache.myrmidon.interfaces.property.NameValidatorManager; -import org.apache.myrmidon.interfaces.workspace.TargetSet; import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; +import org.apache.myrmidon.interfaces.workspace.TargetSet; /** * This contains details for each project that is being executed by a 1.3 +1 -1 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/frontends/ProjectFileFilter.java Index: ProjectFileFilter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/frontends/ProjectFileFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ProjectFileFilter.java 7 Jun 2002 02:46:31 -0000 1.2 +++ ProjectFileFilter.java 5 Jul 2002 03:21:57 -0000 1.3 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.frontends; +import java.io.File; import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileView; -import java.io.File; /* * A basic file filter for Ant project files. 1.3 +1 -1 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/frontends/SwingUI.java Index: SwingUI.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/frontends/SwingUI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SwingUI.java 30 May 2002 06:22:53 -0000 1.2 +++ SwingUI.java 5 Jul 2002 03:21:57 -0000 1.3 @@ -28,13 +28,13 @@ import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFileChooser; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.JSplitPane; import javax.swing.JTextArea; import javax.swing.JTree; import javax.swing.SwingUtilities; -import javax.swing.JOptionPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.apache.myrmidon.Constants; 1.36 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/EmbeddedAnt.java Index: EmbeddedAnt.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/EmbeddedAnt.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- EmbeddedAnt.java 2 Jul 2002 07:52:24 -0000 1.35 +++ EmbeddedAnt.java 5 Jul 2002 03:21:57 -0000 1.36 @@ -23,8 +23,8 @@ import org.apache.myrmidon.api.metadata.ModelElement; import org.apache.myrmidon.interfaces.embeddor.Embeddor; import org.apache.myrmidon.interfaces.event.TaskEventManager; -import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; import org.apache.myrmidon.interfaces.service.AntServiceKernel; +import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; /** * A utility class, that takes care of launching Myrmidon, and building and @@ -207,7 +207,7 @@ for( int i = 0; i < targets.length; i++ ) { final String target = targets[ i ]; - m_embeddor.execute( frame, descriptor, new String[] { target } ); + m_embeddor.execute( frame, descriptor, new String[]{target} ); } } } 1.17 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/deployer/Deployer.java Index: Deployer.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/deployer/Deployer.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Deployer.java 24 Jun 2002 01:50:02 -0000 1.16 +++ Deployer.java 5 Jul 2002 03:21:57 -0000 1.17 @@ -7,8 +7,8 @@ / package org.apache.myrmidon.interfaces.deployer; -import org.apache.myrmidon.interfaces.library.Library; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.interfaces.library.Library; /* * This class deploys type libraries into a registry. 1.8 +4 -4 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/deployer/TypeDefinition.java Index: TypeDefinition.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/deployer/TypeDefinition.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- TypeDefinition.java 22 May 2002 07:36:22 -0000 1.7 +++ TypeDefinition.java 5 Jul 2002 03:21:57 -0000 1.8 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.interfaces.deployer; -import java.util.Map; -import java.util.HashMap; import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import org.apache.myrmidon.interfaces.type.TypeFactory; /* @@ -26,7 +26,7 @@ private final String m_name; private final String m_role; private final TypeFactory m_factory; - private final Map m_attributes ; + private final Map m_attributes; /** * Creates a TypeDefinition 1.32 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java Index: Embeddor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Embeddor.java 2 Jul 2002 07:52:24 -0000 1.31 +++ Embeddor.java 5 Jul 2002 03:21:57 -0000 1.32 @@ -8,13 +8,13 @@ package org.apache.myrmidon.interfaces.embeddor; import java.util.Map; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.event.TaskListener; import org.apache.myrmidon.api.metadata.ModelElement; import org.apache.myrmidon.interfaces.model.Project; -import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; import org.apache.myrmidon.interfaces.service.AntServiceKernel; +import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; /** * Interface through which you embed Myrmidon into applications. 1.4 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/library/Library.java Index: Library.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/library/Library.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Library.java 4 Jul 2002 13:17:23 -0000 1.3 +++ Library.java 5 Jul 2002 03:21:57 -0000 1.4 @@ -9,8 +9,8 @@ import java.net.URL; import org.apache.avalon.excalibur.extension.Extension; -import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.deployer.TypeDefinition; +import org.apache.myrmidon.interfaces.role.RoleInfo; /** * This interface represents a library of Java classes, and deployable types. 1.16 +5 -5 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/model/Project.java Index: Project.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/model/Project.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Project.java 4 Jul 2002 01:53:16 -0000 1.15 +++ Project.java 5 Jul 2002 03:21:57 -0000 1.16 @@ -8,10 +8,10 @@ package org.apache.myrmidon.interfaces.model; import java.io.File; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; / @@ -135,7 +135,7 @@ public Target[] getTargets() { final Collection targets = m_targets.values(); - return (Target[])targets.toArray( new Target[ targets.size() ]); + return (Target[])targets.toArray( new Target[ targets.size() ] ); } / 1.11 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java Index: PropertyResolver.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PropertyResolver.java 9 Jun 2002 13:06:29 -0000 1.10 +++ PropertyResolver.java 5 Jul 2002 03:21:57 -0000 1.11 @@ -7,8 +7,8 @@ / package org.apache.myrmidon.interfaces.property; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /* * 1.10 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java Index: RoleInfo.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- RoleInfo.java 25 Jun 2002 07:34:02 -0000 1.9 +++ RoleInfo.java 5 Jul 2002 03:21:57 -0000 1.10 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.interfaces.role; -import java.util.Map; -import java.util.HashMap; import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /* * A role definition. Role definitions are immutable. 1.2 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/service/ServiceDescriptor.java Index: ServiceDescriptor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/service/ServiceDescriptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ServiceDescriptor.java 15 Jun 2002 07:55:35 -0000 1.1 +++ ServiceDescriptor.java 5 Jul 2002 03:21:57 -0000 1.2 @@ -23,7 +23,7 @@ public ServiceDescriptor( final String role, final ServiceFactory factory ) { - m_roles = new String[] { role }; + m_roles = new String[]{role}; m_factory = factory; } 1.4 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/type/ClassLoaderTypeFactory.java Index: ClassLoaderTypeFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/type/ClassLoaderTypeFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ClassLoaderTypeFactory.java 4 Jul 2002 13:12:20 -0000 1.3 +++ ClassLoaderTypeFactory.java 5 Jul 2002 03:21:57 -0000 1.4 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.interfaces.type; -import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.avalon.excalibur.i18n.ResourceManager; import java.util.HashMap; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /* * A {@link TypeFactory} implementation that creates instances using classes 1.17 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java Index: DefaultTypeFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- DefaultTypeFactory.java 4 Jul 2002 13:12:20 -0000 1.16 +++ DefaultTypeFactory.java 5 Jul 2002 03:21:57 -0000 1.17 @@ -82,7 +82,7 @@ // Instantiate the object try { - if( m_implClass == null) + if( m_implClass == null ) { m_implClass = m_classLoader.loadClass( m_implClassName ); } 1.4 +2 -2 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/workspace/TargetSet.java Index: TargetSet.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/workspace/TargetSet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TargetSet.java 5 Jul 2002 00:24:47 -0000 1.3 +++ TargetSet.java 5 Jul 2002 03:21:57 -0000 1.4 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.interfaces.workspace; +import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Collections; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.interfaces.model.Target; 1.19 +3 -3 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/launcher/Main.java Index: Main.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/launcher/Main.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Main.java 23 May 2002 01:50:26 -0000 1.18 +++ Main.java 5 Jul 2002 03:21:58 -0000 1.19 @@ -13,9 +13,9 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.StringTokenizer; -import java.util.Map; import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; /* * Basic Loader that is responsible for all the hackery to get classloader to work. 1.2 +4 -4 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/DependencyMetricsTestCase.java Index: DependencyMetricsTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/DependencyMetricsTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DependencyMetricsTestCase.java 8 Apr 2002 00:28:52 -0000 1.1 +++ DependencyMetricsTestCase.java 5 Jul 2002 03:21:58 -0000 1.2 @@ -89,7 +89,7 @@ { final JavaPackage efferent = (JavaPackage)afferents.next(); final String efferentName = efferent.getName(); - if( ! isSubPackage( name, efferentName ) ) + if( !isSubPackage( name, efferentName ) ) { fail( "The launcher package " + name + " depends on external classes " + "contained in " + efferentName + ". No classes besides " + @@ -283,11 +283,11 @@ private boolean isSubPackage( final String basePackage, final String subpackage ) { - if( ! subpackage.startsWith( basePackage ) ) + if( !subpackage.startsWith( basePackage ) ) { return false; } return ( subpackage.length() == basePackage.length() - \|\| subpackage.charAt( basePackage.length() ) == '.' ); + \|\| subpackage.charAt( basePackage.length() ) == '.' ); } } 1.3 +3 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/TrackingTaskListener.java Index: TrackingTaskListener.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/TrackingTaskListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TrackingTaskListener.java 29 May 2002 13:03:33 -0000 1.2 +++ TrackingTaskListener.java 5 Jul 2002 03:21:58 -0000 1.3 @@ -9,10 +9,10 @@ import java.util.ArrayList; import junit.framework.Assert; -import org.apache.myrmidon.api.event.TaskEvent; -import org.apache.myrmidon.api.event.TaskListener; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.event.TaskEvent; +import org.apache.myrmidon.api.event.TaskListener; /** * A task listener that asserts that it receives a particular sequence of 1.55 +2 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/AbstractComponentTest.java Index: AbstractComponentTest.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/AbstractComponentTest.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- AbstractComponentTest.java 2 Jul 2002 07:40:32 -0000 1.54 +++ AbstractComponentTest.java 5 Jul 2002 03:21:58 -0000 1.55 @@ -253,7 +253,7 @@ "/", "gen:///test:0:0", getTestDirectory(), - serviceKernel ); + serviceKernel ); } /** 1.3 +1 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java Index: MyRole1Adaptor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MyRole1Adaptor.java 18 Apr 2002 12:53:15 -0000 1.2 +++ MyRole1Adaptor.java 5 Jul 2002 03:21:58 -0000 1.3 @@ -7,7 +7,6 @@ / package org.apache.myrmidon.components.configurer.test; -import org.apache.myrmidon.components.configurer.test.MyRole1; import org.apache.myrmidon.AbstractContainerTestCase; /* 1.2 +1 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/MyType1.java Index: MyType1.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/MyType1.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MyType1.java 17 Mar 2002 08:07:08 -0000 1.1 +++ MyType1.java 5 Jul 2002 03:21:58 -0000 1.2 @@ -7,8 +7,6 @@ / package org.apache.myrmidon.components.configurer.test; -import org.apache.myrmidon.components.configurer.test.MyRole1; - /* * A basic implementation of MyRole1 to test configurer. * 1.2 +1 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/MyType2.java Index: MyType2.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/MyType2.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MyType2.java 17 Mar 2002 08:07:08 -0000 1.1 +++ MyType2.java 5 Jul 2002 03:21:58 -0000 1.2 @@ -7,8 +7,6 @@ / package org.apache.myrmidon.components.configurer.test; -import org.apache.myrmidon.components.configurer.test.MyRole1; - /* * A basic implementation of MyRole1 to test configurer. * 1.2 +1 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java Index: ConfigTestPropResolution.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ConfigTestPropResolution.java 17 Mar 2002 08:07:08 -0000 1.1 +++ ConfigTestPropResolution.java 5 Jul 2002 03:21:58 -0000 1.2 @@ -7,8 +7,6 @@ / package org.apache.myrmidon.components.configurer.test.data; -import java.util.List; -import java.util.ArrayList; import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /* 1.2 +0 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java Index: ConfigTestReferenceElement.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ConfigTestReferenceElement.java 17 Mar 2002 08:07:08 -0000 1.1 +++ ConfigTestReferenceElement.java 5 Jul 2002 03:21:58 -0000 1.2 @@ -7,8 +7,6 @@ / package org.apache.myrmidon.components.configurer.test.data; -import java.util.ArrayList; -import java.util.List; import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /* 1.3 +3 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAndAdd.java Index: ConfigTestSetAndAdd.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAndAdd.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ConfigTestSetAndAdd.java 18 Apr 2002 12:53:15 -0000 1.2 +++ ConfigTestSetAndAdd.java 5 Jul 2002 03:21:58 -0000 1.3 @@ -34,11 +34,11 @@ public boolean equals( final Object obj ) { ConfigTestSetAndAdd test = (ConfigTestSetAndAdd)obj; - if( ! AbstractContainerTestCase.equals( m_prop, test.m_prop) ) + if( !AbstractContainerTestCase.equals( m_prop, test.m_prop ) ) { return false; } - else if( ! m_nested.equals( test.m_nested ) ) + else if( !m_nested.equals( test.m_nested ) ) { return false; } 1.3 +1 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java Index: ConfigTestSetAttribute.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ConfigTestSetAttribute.java 19 Mar 2002 11:19:24 -0000 1.2 +++ ConfigTestSetAttribute.java 5 Jul 2002 03:21:58 -0000 1.3 @@ -7,8 +7,6 @@ / package org.apache.myrmidon.components.configurer.test.data; -import java.util.List; -import java.util.ArrayList; import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /* 1.3 +3 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java Index: ConfigTestTypedAdderConversion.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ConfigTestTypedAdderConversion.java 11 Apr 2002 12:58:58 -0000 1.2 +++ ConfigTestTypedAdderConversion.java 5 Jul 2002 03:21:58 -0000 1.3 @@ -8,8 +8,8 @@ package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.test.MyRole1; import org.apache.myrmidon.components.TestDataType; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Simple class to test typed adder. @@ -27,6 +27,7 @@ { m_prop = prop; } + public void add( final MyRole1 role1 ) { m_roles.add( role1 ); 1.3 +0 -1 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/deployer/test/TestType1.java Index: TestType1.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/deployer/test/TestType1.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestType1.java 11 Apr 2002 12:58:59 -0000 1.2 +++ TestType1.java 5 Jul 2002 03:21:58 -0000 1.3 @@ -8,7 +8,6 @@ package org.apache.myrmidon.components.deployer.test; import org.apache.myrmidon.components.TestDataType; -import org.apache.myrmidon.components.deployer.test.TestRole1; /** * A test data-type. 1.43 +3 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java Index: DefaultEmbeddorTest.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- DefaultEmbeddorTest.java 4 Jul 2002 01:53:16 -0000 1.42 +++ DefaultEmbeddorTest.java 5 Jul 2002 03:21:58 -0000 1.43 @@ -19,8 +19,8 @@ import org.apache.myrmidon.interfaces.embeddor.Embeddor; import org.apache.myrmidon.interfaces.event.TaskEventManager; import org.apache.myrmidon.interfaces.model.Project; -import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; import org.apache.myrmidon.interfaces.service.AntServiceKernel; +import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; /** * Test cases for the default embeddor. @@ -140,7 +140,7 @@ // Execute the default target final String defaultTargetName = project.getDefaultTargetName(); - embeddor.execute( frame, project.getProjectDescriptor(), new String[] { defaultTargetName } ); + embeddor.execute( frame, project.getProjectDescriptor(), new String[]{defaultTargetName} ); // Cleanup listener.assertComplete(); 1.6 +7 -7 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/library/test/DefaultLibraryManagerTestCase.java Index: DefaultLibraryManagerTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/library/test/DefaultLibraryManagerTestCase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DefaultLibraryManagerTestCase.java 30 Jun 2002 09:58:15 -0000 1.5 +++ DefaultLibraryManagerTestCase.java 5 Jul 2002 03:21:58 -0000 1.6 @@ -15,8 +15,8 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.components.AbstractComponentTest; import org.apache.myrmidon.components.library.DefaultLibraryManager; -import org.apache.myrmidon.interfaces.library.LibraryManager; import org.apache.myrmidon.interfaces.library.Library; +import org.apache.myrmidon.interfaces.library.LibraryManager; /** * Test cases for the DefaultClassLoaderManager. @@ -76,7 +76,7 @@ protected Map getParameters() { final Map parameters = super.getParameters(); - parameters.put( "myrmidon.ext.path", new File[] { getTestDirectory() } ); + parameters.put( "myrmidon.ext.path", new File[]{getTestDirectory()} ); parameters.put( "myrmidon.shared.classloader", m_commonClassLoader ); return parameters; } @@ -220,7 +220,7 @@ // Build the classloader final File jarFile = getTestResource( "test-no-dependencies.jar" ); - final Library lib = m_libraryManager.createLibrary( new File[] { jarFile } ); + final Library lib = m_libraryManager.createLibrary( new File[]{jarFile} ); final ClassLoader classLoader = lib.getClassLoader(); // Check shared classes/resources @@ -250,7 +250,7 @@ // Build the Jar classloader final File jarFile = getTestResource( "test-one-dependency.jar" ); - final Library lib = m_libraryManager.createLibrary( new File[] { jarFile } ); + final Library lib = m_libraryManager.createLibrary( new File[]{jarFile} ); final ClassLoader classLoader = lib.getClassLoader(); // Check shared classes/resources @@ -278,10 +278,10 @@ // Build the Jar classloaders final File jarFile1 = getTestResource( "test-one-dependency.jar" ); - final Library lib1 = m_libraryManager.createLibrary( new File[] { jarFile1 } ); + final Library lib1 = m_libraryManager.createLibrary( new File[]{jarFile1} ); final ClassLoader classLoader1 = lib1.getClassLoader(); final File jarFile2 = getTestResource( "test-one-dependency-2.jar" ); - final Library lib2 = m_libraryManager.createLibrary( new File[] { jarFile2 } ); + final Library lib2 = m_libraryManager.createLibrary( new File[]{jarFile2} ); final ClassLoader classLoader2 = lib2.getClassLoader(); // Check extension classes/resources 1.14 +3 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java Index: AbstractPropertyResolverTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- AbstractPropertyResolverTestCase.java 30 Jun 2002 09:58:15 -0000 1.13 +++ AbstractPropertyResolverTestCase.java 5 Jul 2002 03:21:58 -0000 1.14 @@ -9,8 +9,8 @@ import java.io.File; import java.util.Date; -import org.apache.excalibur.converter.lib.ObjectToStringConverter; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.excalibur.converter.lib.ObjectToStringConverter; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.components.AbstractComponentTest; @@ -54,7 +54,7 @@ protected Object createComponent( String role, Class defaultImpl ) throws Exception { - if( role.equals( PropertyResolver.ROLE) ) + if( role.equals( PropertyResolver.ROLE ) ) { return createResolver(); } 1.4 +2 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java Index: ClassicPropertyResolverTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ClassicPropertyResolverTestCase.java 9 Apr 2002 02:26:34 -0000 1.3 +++ ClassicPropertyResolverTestCase.java 5 Jul 2002 03:21:58 -0000 1.4 @@ -7,9 +7,8 @@ / package org.apache.myrmidon.components.property.test; -import org.apache.myrmidon.interfaces.property.PropertyResolver; -import org.apache.myrmidon.components.property.test.AbstractPropertyResolverTestCase; import org.apache.myrmidon.components.property.ClassicPropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /* * A test for {@link org.apache.myrmidon.components.property.ClassicPropertyResolver}. 1.5 +3 -4 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java Index: DefaultPropertyResolverTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultPropertyResolverTestCase.java 28 Apr 2002 05:51:00 -0000 1.4 +++ DefaultPropertyResolverTestCase.java 5 Jul 2002 03:21:58 -0000 1.5 @@ -7,11 +7,10 @@ / package org.apache.myrmidon.components.property.test; -import org.apache.myrmidon.interfaces.property.PropertyResolver; -import org.apache.myrmidon.components.property.test.AbstractPropertyResolverTestCase; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.components.property.DefaultPropertyResolver; import org.apache.myrmidon.components.property.DefaultPropertyStore; -import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /* * Functional tests for {@link org.apache.myrmidon.components.property.DefaultPropertyResolver}. 1.2 +1 -3 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl1.java Index: TestServiceImpl1.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl1.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestServiceImpl1.java 17 Mar 2002 08:07:10 -0000 1.1 +++ TestServiceImpl1.java 5 Jul 2002 03:21:58 -0000 1.2 @@ -7,8 +7,6 @@ / package org.apache.myrmidon.components.service.test; -import org.apache.myrmidon.components.service.test.TestService; - /* * A test service implementation. * 1.2 +1 -4 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl2.java Index: TestServiceImpl2.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl2.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestServiceImpl2.java 17 Mar 2002 08:07:10 -0000 1.1 +++ TestServiceImpl2.java 5 Jul 2002 03:21:58 -0000 1.2 @@ -7,9 +7,6 @@ / package org.apache.myrmidon.components.service.test; -import org.apache.myrmidon.components.service.test.LifecycleValidator; -import org.apache.myrmidon.components.service.test.TestService; - /* * A test service that asserts it has been set-up correctly. * 1.2 +2 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/type/test/DefaultRoleManagerTestCase.java Index: DefaultRoleManagerTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/type/test/DefaultRoleManagerTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultRoleManagerTestCase.java 30 Jun 2002 06:23:31 -0000 1.1 +++ DefaultRoleManagerTestCase.java 5 Jul 2002 03:21:59 -0000 1.2 @@ -9,8 +9,8 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractContainerTestCase; -import org.apache.myrmidon.components.type.DefaultTypeManager; import org.apache.myrmidon.api.Task; +import org.apache.myrmidon.components.type.DefaultTypeManager; import org.apache.myrmidon.interfaces.role.RoleException; import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.role.RoleManager; 1.13 +2 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/type/test/DefaultTypeManagerTestCase.java Index: DefaultTypeManagerTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/type/test/DefaultTypeManagerTestCase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DefaultTypeManagerTestCase.java 4 Jul 2002 13:12:20 -0000 1.12 +++ DefaultTypeManagerTestCase.java 5 Jul 2002 03:21:59 -0000 1.13 @@ -292,7 +292,7 @@ // Check that the types are available. assertCreate( m_typeRegistry, TEST_ROLE, TYPE_NAME1, groupClass ); assertCreate( m_typeRegistry, TEST_ROLE, - makeQName( groupNs, TYPE_NAME1), groupClass ); + makeQName( groupNs, TYPE_NAME1 ), groupClass ); // Now register a single type over these registrations registerType( m_typeRegistry, TEST_ROLE, individualNs, 1.6 +5 -5 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java Index: TypeFactoryTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- TypeFactoryTestCase.java 4 Jul 2002 13:12:20 -0000 1.5 +++ TypeFactoryTestCase.java 5 Jul 2002 03:21:59 -0000 1.6 @@ -9,13 +9,13 @@ import java.io.File; import java.net.URL; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractContainerTestCase; +import org.apache.myrmidon.interfaces.type.ClassLoaderTypeFactory; import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; import org.apache.myrmidon.interfaces.type.ReloadingTypeFactory; import org.apache.myrmidon.interfaces.type.TypeException; -import org.apache.myrmidon.interfaces.type.ClassLoaderTypeFactory; import org.apache.myrmidon.interfaces.type.TypeFactory; -import org.apache.avalon.excalibur.i18n.Resources; /** * These are unit tests that test the basic operation of TypeFactories. @@ -62,7 +62,7 @@ private void testUnknownType( final TypeFactory factory ) { final String typeName = "unknown-type"; - assertTrue( ! factory.canCreate( typeName ) ); + assertTrue( !factory.canCreate( typeName ) ); try { factory.create( typeName ); @@ -71,7 +71,7 @@ catch( TypeException e ) { final Resources res = getResourcesForTested( factory.getClass() ); - final String message = res.getString( "no-mapping.error", typeName ); + final String message = res.getString( "no-mapping.error", typeName ); assertSameMessage( message, e ); } } 1.29 +7 -7 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java Index: ExecuteTarget.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ExecuteTarget.java 4 Jul 2002 00:19:17 -0000 1.28 +++ ExecuteTarget.java 5 Jul 2002 03:21:59 -0000 1.29 @@ -7,17 +7,17 @@ / package org.apache.myrmidon.framework; -import java.util.HashMap; -import java.util.Map; import java.util.Arrays; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.interfaces.embeddor.Embeddor; -import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; import org.apache.myrmidon.interfaces.service.AntServiceKernel; +import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; /* * A utility class that simplifies executing a target in a new workspace. @@ -55,7 +55,7 @@ { if( target != null ) { - m_targets = new String[] { target }; + m_targets = new String[]{target}; } else { @@ -107,11 +107,11 @@ catch( final Exception e ) { final String message; - if( m_targets != null && m_targets.length ==1 ) + if( m_targets != null && m_targets.length == 1 ) { message = REZ.getString( "execute-target.execute.error", m_project.getUri(), - m_targets[0] ); + m_targets[ 0 ] ); } else if( m_targets != null && m_targets.length > 1 ) { 1.2 +1 -2 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/Equals.java Index: Equals.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/Equals.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Equals.java 4 Jun 2002 12:34:20 -0000 1.1 +++ Equals.java 5 Jul 2002 03:21:59 -0000 1.2 @@ -8,9 +8,8 @@ * the LICENSE.txt file. / -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.framework.conditions.Condition; +import org.apache.myrmidon.api.TaskException; /* * Simple String comparison condition. 1.5 +3 -3 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java Index: IsTrueCondition.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- IsTrueCondition.java 9 Jun 2002 13:17:04 -0000 1.4 +++ IsTrueCondition.java 5 Jul 2002 03:21:59 -0000 1.5 @@ -7,10 +7,10 @@ / package org.apache.myrmidon.framework.conditions; -import org.apache.excalibur.converter.Converter; -import org.apache.excalibur.converter.ConverterException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.excalibur.converter.Converter; +import org.apache.excalibur.converter.ConverterException; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; 1.5 +2 -2 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java Index: FileListToStringConverter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FileListToStringConverter.java 9 Jun 2002 13:11:24 -0000 1.4 +++ FileListToStringConverter.java 5 Jul 2002 03:21:59 -0000 1.5 @@ -7,9 +7,9 @@ / package org.apache.myrmidon.framework.file; +import org.apache.aut.nativelib.PathUtil; import org.apache.excalibur.converter.AbstractConverter; import org.apache.excalibur.converter.ConverterException; -import org.apache.aut.nativelib.PathUtil; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; 1.3 +2 -2 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/file/StringToFileConverter.java Index: StringToFileConverter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/file/StringToFileConverter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- StringToFileConverter.java 9 Jun 2002 13:11:24 -0000 1.2 +++ StringToFileConverter.java 5 Jul 2002 03:21:59 -0000 1.3 @@ -8,10 +8,10 @@ package org.apache.myrmidon.framework.file; import java.io.File; -import org.apache.excalibur.converter.AbstractConverter; -import org.apache.excalibur.converter.ConverterException; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.excalibur.converter.AbstractConverter; +import org.apache.excalibur.converter.ConverterException; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; 1.3 +2 -2 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/ProjectEvent.java Index: ProjectEvent.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/ProjectEvent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ProjectEvent.java 29 May 2002 13:03:33 -0000 1.2 +++ ProjectEvent.java 5 Jul 2002 03:21:59 -0000 1.3 @@ -8,8 +8,8 @@ package org.apache.myrmidon.framework.listener; import java.util.EventObject; -import org.apache.myrmidon.api.event.TaskEvent; import org.apache.myrmidon.api.event.LogLevel; +import org.apache.myrmidon.api.event.TaskEvent; /** * An event raised while processing an Ant project. 1.3 +1 -3 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/ProjectListener.java Index: ProjectListener.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/ProjectListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ProjectListener.java 9 Jun 2002 13:08:30 -0000 1.2 +++ ProjectListener.java 5 Jul 2002 03:21:59 -0000 1.3 @@ -7,8 +7,6 @@ / package org.apache.myrmidon.framework.listener; -import org.apache.myrmidon.framework.listener.ProjectEvent; - /* * The interface to implement if you want to receive * notification of project status. 1.5 +4 -4 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/ProjectListenerDeployer.java Index: ProjectListenerDeployer.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/ProjectListenerDeployer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ProjectListenerDeployer.java 24 Jun 2002 01:50:03 -0000 1.4 +++ ProjectListenerDeployer.java 5 Jul 2002 03:21:59 -0000 1.5 @@ -7,13 +7,13 @@ / package org.apache.myrmidon.framework.listener; +import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.event.TaskListener; import org.apache.myrmidon.interfaces.deployer.DefaultTypeDeployer; import org.apache.myrmidon.interfaces.deployer.TypeDefinition; -import org.apache.myrmidon.interfaces.type.TypeFactory; import org.apache.myrmidon.interfaces.type.AdaptingTypeFactory; +import org.apache.myrmidon.interfaces.type.TypeFactory; import org.apache.myrmidon.interfaces.type.TypeRegistry; -import org.apache.myrmidon.api.event.TaskListener; -import org.apache.myrmidon.api.TaskContext; /* * A deployer for project listeners. Registers the listener as a 1.4 +5 -7 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/TaskToProjectListenerAdapter.java Index: TaskToProjectListenerAdapter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/listener/TaskToProjectListenerAdapter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TaskToProjectListenerAdapter.java 2 Jul 2002 07:29:35 -0000 1.3 +++ TaskToProjectListenerAdapter.java 5 Jul 2002 03:21:59 -0000 1.4 @@ -8,15 +8,13 @@ package org.apache.myrmidon.framework.listener; import java.util.StringTokenizer; +import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.api.event.AbstractTaskListener; import org.apache.myrmidon.api.event.TaskEvent; import org.apache.myrmidon.api.event.TaskListener; -import org.apache.myrmidon.api.event.AbstractTaskListener; -import org.apache.myrmidon.api.metadata.Modeller; -import org.apache.myrmidon.api.metadata.ModelException; import org.apache.myrmidon.api.metadata.ModelElement; -import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.listener.ProjectEvent; -import org.apache.myrmidon.framework.listener.ProjectListener; +import org.apache.myrmidon.api.metadata.ModelException; +import org.apache.myrmidon.api.metadata.Modeller; import org.apache.myrmidon.interfaces.configurer.Configurer; /** 1.6 +7 -7 jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/project/TargetTask.java Index: TargetTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/project/TargetTask.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- TargetTask.java 4 Jul 2002 01:53:16 -0000 1.5 +++ TargetTask.java 5 Jul 2002 03:21:59 -0000 1.6 @@ -7,19 +7,19 @@ / package org.apache.myrmidon.framework.project; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.metadata.ModelElement; -import org.apache.myrmidon.api.metadata.Modeller; import org.apache.myrmidon.api.metadata.ModelException; +import org.apache.myrmidon.api.metadata.Modeller; import org.apache.myrmidon.framework.ModelElementUtil; -import org.apache.myrmidon.interfaces.model.Target; import org.apache.myrmidon.interfaces.model.Project; -import org.apache.myrmidon.interfaces.workspace.TargetSet; -import org.apache.myrmidon.interfaces.property.NameValidatorManager; +import org.apache.myrmidon.interfaces.model.Target; import org.apache.myrmidon.interfaces.property.NameValidator; -import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.myrmidon.interfaces.property.NameValidatorManager; +import org.apache.myrmidon.interfaces.workspace.TargetSet; /* * Adds a target to the current project. 1.4 +2 -2 jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/AbstractTaskTestCase.java Index: AbstractTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/AbstractTaskTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractTaskTestCase.java 27 Jun 2002 11:13:07 -0000 1.3 +++ AbstractTaskTestCase.java 5 Jul 2002 03:21:59 -0000 1.4 @@ -11,11 +11,11 @@ import java.util.Iterator; import java.util.Map; import org.apache.avalon.framework.ExceptionUtil; +import org.apache.myrmidon.TrackingTaskListener; import org.apache.myrmidon.api.event.TaskListener; import org.apache.myrmidon.components.AbstractComponentTest; import org.apache.myrmidon.interfaces.EmbeddedAnt; import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor; -import org.apache.myrmidon.TrackingTaskListener; /** * A base class for test cases which need to execute tasks. 1.2 +3 -3 jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/ExpectExceptionTask.java Index: ExpectExceptionTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/ExpectExceptionTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExpectExceptionTask.java 5 Jun 2002 07:45:36 -0000 1.1 +++ ExpectExceptionTask.java 5 Jul 2002 03:21:59 -0000 1.2 @@ -7,10 +7,10 @@ / package org.apache.myrmidon.framework; +import java.util.ArrayList; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.metadata.ModelElement; -import org.apache.avalon.framework.ExceptionUtil; -import java.util.ArrayList; /* * A unit test task that checks that an expected exception is thrown when 1.2 +2 -2 jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/ExpectedException.java Index: ExpectedException.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/ExpectedException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExpectedException.java 5 Jun 2002 07:45:36 -0000 1.1 +++ ExpectedException.java 5 Jul 2002 03:21:59 -0000 1.2 @@ -49,7 +49,7 @@ } } - if( m_message != null && ! m_message.equals( throwable.getMessage() ) ) + if( m_message != null && !m_message.equals( throwable.getMessage() ) ) { throw new TaskException( "Was expecting error <" + m_message + "> but found <" + throwable.getMessage() + ">", throwable ); 1.5 +2 -2 jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/conditions/test/NotConditionTestCase.java Index: NotConditionTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/conditions/test/NotConditionTestCase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NotConditionTestCase.java 5 Jun 2002 07:58:22 -0000 1.4 +++ NotConditionTestCase.java 5 Jul 2002 03:21:59 -0000 1.5 @@ -7,8 +7,8 @@ / package org.apache.myrmidon.framework.conditions.test; -import org.apache.myrmidon.framework.AbstractTaskTestCase; import java.io.File; +import org.apache.myrmidon.framework.AbstractTaskTestCase; /* * Test cases for the <not> condition. 1.6 +2 -2 jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/file/test/PathTestCase.java Index: PathTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/file/test/PathTestCase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PathTestCase.java 5 Jun 2002 07:58:22 -0000 1.5 +++ PathTestCase.java 5 Jul 2002 03:21:59 -0000 1.6 @@ -10,8 +10,8 @@ import java.io.File; import org.apache.aut.nativelib.PathUtil; import org.apache.avalon.excalibur.io.FileUtil; -import org.apache.myrmidon.framework.AbstractTaskTestCase; import org.apache.myrmidon.LogMessageTracker; +import org.apache.myrmidon.framework.AbstractTaskTestCase; /** * Test-cases for the <path> data type. 1.3 +2 -2 jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/project/test/TargetTaskTestCase.java Index: TargetTaskTestCase.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/test/org/apache/myrmidon/framework/project/test/TargetTaskTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TargetTaskTestCase.java 2 Jul 2002 12:32:34 -0000 1.2 +++ TargetTaskTestCase.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -7,8 +7,8 @@ / package org.apache.myrmidon.framework.project.test; -import org.apache.myrmidon.framework.AbstractTaskTestCase; import java.io.File; +import org.apache.myrmidon.framework.AbstractTaskTestCase; /* * Test cases for the <target> task. 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java Index: ANTLR.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ANTLR.java 14 Apr 2002 09:31:48 -0000 1.1 +++ ANTLR.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -13,9 +13,9 @@ import java.net.URL; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.myrmidon.framework.nativelib.Argument; -import org.apache.myrmidon.framework.file.Path; /** * ANTLR task. 1.3 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Cab.java Index: Cab.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Cab.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Cab.java 23 May 2002 01:50:26 -0000 1.2 +++ Cab.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -16,9 +16,9 @@ import java.util.Iterator; import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.myrmidon.framework.FileSet; import org.apache.myrmidon.framework.nativelib.Commandline; +import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; 1.3 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Get.java Index: Get.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Get.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Get.java 23 May 2002 01:50:26 -0000 1.2 +++ Get.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -17,7 +17,6 @@ import java.util.Date; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * Get a particular file from a URL source. Options include verbose reporting, 1.5 +4 -4 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/IContract.java Index: IContract.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/IContract.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- IContract.java 23 May 2002 01:50:26 -0000 1.4 +++ IContract.java 5 Jul 2002 03:22:00 -0000 1.5 @@ -14,15 +14,15 @@ import java.io.PrintStream; import java.util.Date; import java.util.Properties; +import org.apache.antlib.java.JavaTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.listener.AbstractProjectListener; import org.apache.myrmidon.listeners.LogEvent; import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; import org.apache.tools.todo.taskdefs.javac.Javac; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.myrmidon.framework.file.Path; -import org.apache.myrmidon.framework.file.FileListUtil; -import org.apache.antlib.java.JavaTask; /** * Instruments Java classes with <a href="http://www.reliable-systems.com/tools/"> @@ -731,7 +731,7 @@ // Create the classpath required for iContract itself Path iContractClasspath = new Path(); iContractClasspath.add( baseClasspath ); - iContractClasspath.addLocation( new File(System.getProperty( "java.home" ) + File.separator + ".." + File.separator + "lib" + File.separator + "tools.jar" ) ); + iContractClasspath.addLocation( new File( System.getProperty( "java.home" ) + File.separator + ".." + File.separator + "lib" + File.separator + "tools.jar" ) ); iContractClasspath.addLocation( srcDir ); iContractClasspath.addLocation( repositoryDir ); iContractClasspath.addLocation( instrumentDir ); 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java Index: MatchingTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MatchingTask.java 14 Apr 2002 09:31:48 -0000 1.1 +++ MatchingTask.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -10,9 +10,9 @@ import java.io.File; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.FileSet; import org.apache.myrmidon.framework.Pattern; import org.apache.myrmidon.framework.PatternSet; -import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Rpm.java Index: Rpm.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Rpm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Rpm.java 14 Apr 2002 09:31:48 -0000 1.1 +++ Rpm.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -11,7 +11,6 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.nativelib.Execute; -import org.apache.myrmidon.framework.nativelib.Commandline; /** * @author lucas@collab.net 1.4 +3 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java Index: SQLExec.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SQLExec.java 23 May 2002 01:50:26 -0000 1.3 +++ SQLExec.java 5 Jul 2002 03:22:00 -0000 1.4 @@ -32,9 +32,9 @@ import java.util.StringTokenizer; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.file.Path; -import org.apache.myrmidon.framework.file.FileListUtil; import org.apache.myrmidon.framework.FileSet; +import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.EnumeratedAttribute; import org.apache.tools.todo.types.ScannerUtil; @@ -534,7 +534,7 @@ } getContext().info( goodSql + " of " + totalSql + - " SQL statements executed successfully" ); + " SQL statements executed successfully" ); } / 1.4 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Script.java Index: Script.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/Script.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Script.java 24 May 2002 03:58:37 -0000 1.3 +++ Script.java 5 Jul 2002 03:22:00 -0000 1.4 @@ -15,9 +15,9 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.Map; +import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.avalon.excalibur.io.IOUtil; / * Execute a script 1.4 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/WaitFor.java Index: WaitFor.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/WaitFor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- WaitFor.java 23 May 2002 01:50:26 -0000 1.3 +++ WaitFor.java 5 Jul 2002 03:22:00 -0000 1.4 @@ -8,8 +8,8 @@ package org.apache.tools.todo.taskdefs; import java.util.Hashtable; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.conditions.AndCondition; import org.apache.myrmidon.framework.conditions.Condition; import org.apache.tools.todo.types.EnumeratedAttribute; 1.4 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java Index: Jar.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Jar.java 23 May 2002 01:50:27 -0000 1.3 +++ Jar.java 5 Jul 2002 03:22:00 -0000 1.4 @@ -19,12 +19,12 @@ import java.io.Reader; import java.util.Enumeration; import java.util.zip.ZipFile; +import org.apache.excalibur.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.taskdefs.manifest.Manifest; import org.apache.tools.todo.taskdefs.manifest.ManifestException; import org.apache.tools.todo.taskdefs.manifest.ManifestUtil; import org.apache.tools.todo.types.FileScanner; -import org.apache.excalibur.zip.ZipOutputStream; /** * Creates a JAR archive. 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Unzip.java Index: Unzip.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/Unzip.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Unzip.java 14 Apr 2002 09:31:48 -0000 1.1 +++ Unzip.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -15,7 +15,6 @@ import java.util.zip.ZipInputStream; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.archive.Expand; /** * Untar a file. Heavily based on the Expand task. 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/War.java Index: War.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/archive/War.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- War.java 14 Apr 2002 09:31:48 -0000 1.1 +++ War.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -9,8 +9,8 @@ import java.io.File; import java.io.IOException; -import org.apache.myrmidon.api.TaskException; import org.apache.excalibur.zip.ZipOutputStream; +import org.apache.myrmidon.api.TaskException; /** * Creates a WAR archive. 1.3 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.java Index: CompilerAdapter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CompilerAdapter.java 23 May 2002 01:50:27 -0000 1.2 +++ CompilerAdapter.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -7,8 +7,8 @@ / package org.apache.tools.todo.taskdefs.javac; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /* * The interface that all compiler adapters must adher to. <p> 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.java Index: CompilerAdapterFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CompilerAdapterFactory.java 14 Apr 2002 09:31:49 -0000 1.1 +++ CompilerAdapterFactory.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -9,7 +9,6 @@ import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.javac.CompilerAdapter; /** * Creates the necessary compiler adapter, given basic criteria. 1.3 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java Index: Gcj.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Gcj.java 23 May 2002 01:50:27 -0000 1.2 +++ Gcj.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -8,9 +8,9 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Commandline; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.nativelib.Commandline; /** * The implementation of the gcj compiler. This is primarily a cut-and-paste 1.4 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java Index: Javac.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Javac.java 23 May 2002 01:50:27 -0000 1.3 +++ Javac.java 5 Jul 2002 03:22:00 -0000 1.4 @@ -13,9 +13,9 @@ import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.JavaVersion; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.SourceFileScanner; import org.apache.tools.todo.util.mappers.GlobPatternMapper; @@ -657,7 +657,7 @@ // PATH. File jExecutable = new File( System.getProperty( "java.home" ) + - "/../bin/javac" + extension ); + "/../bin/javac" + extension ); if( jExecutable.exists() && !Os.isFamily( Os.OS_FAMILY_NETWARE ) ) { 1.2 +0 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac12.java Index: Javac12.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac12.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Javac12.java 14 Apr 2002 09:31:49 -0000 1.1 +++ Javac12.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -11,10 +11,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.framework.nativelib.Commandline; import org.apache.myrmidon.framework.nativelib.ArgumentList; -import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the javac compiler for JDK 1.2 This is primarily a 1.3 +0 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac13.java Index: Javac13.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Javac13.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Javac13.java 6 May 2002 09:29:45 -0000 1.2 +++ Javac13.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -9,10 +9,7 @@ import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.framework.nativelib.Commandline; import org.apache.myrmidon.framework.nativelib.ArgumentList; -import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the javac compiler for JDK 1.3 This is primarily a 1.3 +0 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/JavacExternal.java Index: JavacExternal.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/JavacExternal.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JavacExternal.java 23 May 2002 01:50:27 -0000 1.2 +++ JavacExternal.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -8,9 +8,7 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.nativelib.Commandline; -import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * Performs a compile using javac externally. 1.3 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java Index: Jikes.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Jikes.java 23 May 2002 01:50:27 -0000 1.2 +++ Jikes.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -8,9 +8,9 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Commandline; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.nativelib.Commandline; /** * The implementation of the jikes compiler. This is primarily a cut-and-paste 1.2 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java Index: Jvc.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Jvc.java 14 Apr 2002 09:31:49 -0000 1.1 +++ Jvc.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -8,9 +8,9 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Commandline; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.nativelib.Commandline; /** * The implementation of the jvc compiler from microsoft. This is primarily a 1.2 +3 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java Index: Kjc.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Kjc.java 14 Apr 2002 09:31:49 -0000 1.1 +++ Kjc.java 5 Jul 2002 03:22:00 -0000 1.2 @@ -9,10 +9,10 @@ import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Commandline; -import org.apache.myrmidon.framework.nativelib.ArgumentList; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.nativelib.ArgumentList; +import org.apache.myrmidon.framework.nativelib.Commandline; /** * The implementation of the Java compiler for KJC. This is primarily a 1.3 +0 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Sj.java Index: Sj.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javac/Sj.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Sj.java 23 May 2002 01:50:27 -0000 1.2 +++ Sj.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -8,9 +8,7 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.nativelib.Commandline; -import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the sj compiler. Uses the defaults for 1.3 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java Index: JJTree.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JJTree.java 6 May 2002 09:29:45 -0000 1.2 +++ JJTree.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -12,8 +12,8 @@ import java.util.Hashtable; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.java.ExecuteJava; /** * Taskdef for the JJTree compiler compiler. 1.3 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java Index: JavaCC.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JavaCC.java 6 May 2002 09:29:45 -0000 1.2 +++ JavaCC.java 5 Jul 2002 03:22:00 -0000 1.3 @@ -12,8 +12,8 @@ import java.util.Hashtable; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.java.ExecuteJava; /** * Taskdef for the JavaCC compiler compiler. 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java Index: Javadoc.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Javadoc.java 14 Apr 2002 09:31:49 -0000 1.1 +++ Javadoc.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -19,12 +19,12 @@ import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.myrmidon.framework.FileSet; import org.apache.myrmidon.framework.Pattern; import org.apache.myrmidon.framework.file.FileListUtil; import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.nativelib.ArgumentList; +import org.apache.myrmidon.framework.nativelib.Execute; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java Index: JDependTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JDependTask.java 14 Apr 2002 09:31:50 -0000 1.1 +++ JDependTask.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -13,8 +13,8 @@ import java.io.PrintWriter; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.java.ExecuteJava; /** * Ant task to run JDepend tests. <p> 1.3 +5 -5 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java Index: JspC.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JspC.java 6 May 2002 09:29:45 -0000 1.2 +++ JspC.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -11,11 +11,11 @@ import java.util.ArrayList; import java.util.Date; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.taskdefs.jsp.compilers.CompilerAdapter; import org.apache.tools.todo.taskdefs.jsp.compilers.CompilerAdapterFactory; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.myrmidon.framework.file.Path; /** * Ant task to run the jsp compiler. <p> @@ -384,9 +384,9 @@ CompilerAdapter adapter = CompilerAdapterFactory.getCompiler( compiler.toString(), getContext() ); getContext().info( "Compiling " + compileList.size() + - " source file" - + ( compileList.size() == 1 ? "" : "s" ) - + ( destDir != null ? " to " + destDir : "" ) ); + " source file" + + ( compileList.size() == 1 ? "" : "s" ) + + ( destDir != null ? " to " + destDir : "" ) ); // now we need to populate the compiler adapter adapter.setJspc( this ); 1.2 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java Index: WLJspc.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WLJspc.java 14 Apr 2002 09:31:50 -0000 1.1 +++ WLJspc.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -12,11 +12,11 @@ import java.util.Date; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.myrmidon.framework.file.Path; -import org.apache.myrmidon.framework.file.FileListUtil; /** * Class to precompile JSP's using weblogic's jsp compiler (weblogic.jspc) 1.3 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/CompilerAdapter.java Index: CompilerAdapter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/CompilerAdapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CompilerAdapter.java 23 May 2002 01:50:27 -0000 1.2 +++ CompilerAdapter.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -7,8 +7,8 @@ / package org.apache.tools.todo.taskdefs.jsp.compilers; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.taskdefs.jsp.JspC; /* 1.2 +1 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/CompilerAdapterFactory.java Index: CompilerAdapterFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/CompilerAdapterFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CompilerAdapterFactory.java 14 Apr 2002 09:31:50 -0000 1.1 +++ CompilerAdapterFactory.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -7,9 +7,8 @@ / package org.apache.tools.todo.taskdefs.jsp.compilers; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; /* * Creates the necessary compiler adapter, given basic criteria. 1.2 +1 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java Index: JasperC.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JasperC.java 14 Apr 2002 09:31:50 -0000 1.1 +++ JasperC.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -9,9 +9,8 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.java.ExecuteJava; -import org.apache.tools.todo.taskdefs.jsp.JspC; -import org.apache.myrmidon.framework.nativelib.Commandline; import org.apache.myrmidon.framework.nativelib.ArgumentList; +import org.apache.tools.todo.taskdefs.jsp.JspC; /** * The implementation of the jasper compiler. This is a cut-and-paste of the 1.3 +3 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java Index: JUnitTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JUnitTask.java 23 May 2002 01:50:27 -0000 1.2 +++ JUnitTask.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -18,16 +18,16 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.myrmidon.framework.nativelib.Argument; +import org.apache.myrmidon.framework.nativelib.ArgumentList; import org.apache.myrmidon.framework.nativelib.Commandline; -import org.apache.tools.todo.types.EnumeratedAttribute; import org.apache.myrmidon.framework.nativelib.EnvironmentData; import org.apache.myrmidon.framework.nativelib.EnvironmentVariable; +import org.apache.tools.todo.types.EnumeratedAttribute; import org.apache.tools.todo.types.SysProperties; -import org.apache.myrmidon.framework.nativelib.ArgumentList; /** * Ant task to run JUnit tests. <p> 1.3 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java Index: XMLResultAggregator.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XMLResultAggregator.java 6 May 2002 09:29:45 -0000 1.2 +++ XMLResultAggregator.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -20,7 +20,6 @@ import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; 1.2 +1 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/Manifest.java Index: Manifest.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/Manifest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Manifest.java 14 Apr 2002 09:31:51 -0000 1.1 +++ Manifest.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -8,11 +8,9 @@ package org.apache.tools.todo.taskdefs.manifest; import java.util.Collection; -import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; import java.util.Set; -import org.apache.myrmidon.api.TaskException; /** * Class to manage Manifest information 1.3 +1 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestTask.java Index: ManifestTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestTask.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ManifestTask.java 23 May 2002 01:50:27 -0000 1.2 +++ ManifestTask.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -17,8 +17,6 @@ import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.manifest.Manifest; -import org.apache.tools.todo.taskdefs.manifest.Section; /** * Class to manage Manifest information 1.3 +1 -4 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java Index: ManifestUtil.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ManifestUtil.java 6 May 2002 09:29:45 -0000 1.2 +++ ManifestUtil.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -15,9 +15,6 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; import java.util.jar.Attributes; -import org.apache.tools.todo.taskdefs.manifest.Manifest; -import org.apache.tools.todo.taskdefs.manifest.Section; -import org.apache.tools.todo.taskdefs.manifest.Attribute; /** * Utility methods for manifest stuff. 1.2 +5 -5 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/Section.java Index: Section.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/manifest/Section.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Section.java 14 Apr 2002 09:31:51 -0000 1.1 +++ Section.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -116,15 +116,15 @@ if( attribute.getName().equalsIgnoreCase( ManifestUtil.ATTRIBUTE_NAME ) ) { m_warnings.add( "\"" + ManifestUtil.ATTRIBUTE_NAME + "\" attributes should not occur in the " + - "main section and must be the first element in all " + - "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); + "main section and must be the first element in all " + + "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); return attribute.getValue(); } if( attribute.getName().toLowerCase().startsWith( ManifestUtil.ATTRIBUTE_FROM.toLowerCase() ) ) { m_warnings.add( "Manifest attributes should not start with \"" + - ManifestUtil.ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); + ManifestUtil.ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); } else { @@ -160,7 +160,7 @@ if( check != null ) { throw new ManifestException( "Specify the section name using the \"name\" attribute of the <section> element rather " + - "than using a \"Name\" manifest attribute" ); + "than using a \"Name\" manifest attribute" ); } } 1.3 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java Index: MimeMail.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MimeMail.java 23 May 2002 01:50:27 -0000 1.2 +++ MimeMail.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -25,7 +25,6 @@ import javax.mail.internet.MimeMultipart; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/TelnetTask.java Index: TelnetTask.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/net/TelnetTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TelnetTask.java 14 Apr 2002 09:31:51 -0000 1.1 +++ TelnetTask.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -15,7 +15,6 @@ import java.util.Iterator; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; /** * Class to provide automated telnet protocol support for the Ant build tool 1.2 +0 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java Index: KaffeRmic.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- KaffeRmic.java 14 Apr 2002 09:31:51 -0000 1.1 +++ KaffeRmic.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -10,10 +10,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.framework.nativelib.Commandline; import org.apache.myrmidon.framework.nativelib.ArgumentList; -import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter; /** * The implementation of the rmic for Kaffe 1.3 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java Index: Rmic.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Rmic.java 6 May 2002 09:29:45 -0000 1.2 +++ Rmic.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -14,8 +14,8 @@ import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; -import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.SourceFileScanner; 1.3 +1 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java Index: RmicAdapter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RmicAdapter.java 23 May 2002 01:50:28 -0000 1.2 +++ RmicAdapter.java 5 Jul 2002 03:22:01 -0000 1.3 @@ -7,11 +7,10 @@ / package org.apache.tools.todo.taskdefs.rmic; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; import org.apache.myrmidon.framework.file.Path; -import org.apache.tools.todo.taskdefs.rmic.Rmic; /* * The interface that all rmic adapters must adher to. <p> 1.2 +1 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java Index: RmicAdapterFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RmicAdapterFactory.java 14 Apr 2002 09:31:51 -0000 1.1 +++ RmicAdapterFactory.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -7,10 +7,8 @@ / package org.apache.tools.todo.taskdefs.rmic; -import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.todo.taskdefs.rmic.KaffeRmic; -import org.apache.tools.todo.taskdefs.rmic.RmicAdapter; +import org.apache.myrmidon.api.TaskException; /* * Creates the necessary rmic adapter, given basic criteria. 1.2 +0 -4 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/SunRmic.java Index: SunRmic.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/SunRmic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SunRmic.java 14 Apr 2002 09:31:51 -0000 1.1 +++ SunRmic.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -7,15 +7,11 @@ / package org.apache.tools.todo.taskdefs.rmic; -import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.framework.nativelib.Commandline; import org.apache.myrmidon.framework.nativelib.ArgumentList; -import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter; /* * The implementation of the rmic for SUN's JDK. 1.2 +0 -4 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/WLRmic.java Index: WLRmic.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/rmic/WLRmic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- WLRmic.java 14 Apr 2002 09:31:51 -0000 1.1 +++ WLRmic.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -7,13 +7,9 @@ / package org.apache.tools.todo.taskdefs.rmic; -import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.java.ExecuteJava; -import org.apache.myrmidon.framework.nativelib.Commandline; import org.apache.myrmidon.framework.nativelib.ArgumentList; -import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter; /* * The implementation of the rmic for WebLogic 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java Index: StyleBook.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StyleBook.java 14 Apr 2002 09:31:52 -0000 1.1 +++ StyleBook.java 5 Jul 2002 03:22:01 -0000 1.2 @@ -8,8 +8,8 @@ package org.apache.tools.todo.taskdefs.stylebook; import java.io.File; -import org.apache.myrmidon.api.TaskException; import org.apache.antlib.java.JavaTask; +import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.nativelib.Argument; / 1.5 +8 -12 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/FixCRLF.java Index: FixCRLF.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/FixCRLF.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FixCRLF.java 2 Jun 2002 14:08:07 -0000 1.4 +++ FixCRLF.java 5 Jul 2002 03:22:02 -0000 1.5 @@ -24,11 +24,7 @@ import org.apache.aut.nativelib.Os; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.tools.todo.taskdefs.MatchingTask; -import org.apache.tools.todo.taskdefs.text.AddAsisRemove; -import org.apache.tools.todo.taskdefs.text.CrLf; import org.apache.tools.todo.types.DirectoryScanner; / @@ -127,7 +123,7 @@ public FixCRLF() { tabs = ASIS; - if( Os.isFamily( Os.OS_FAMILY_WINDOWS) ) + if( Os.isFamily( Os.OS_FAMILY_WINDOWS ) ) { ctrlz = ASIS; eol = CRLF; @@ -323,12 +319,12 @@ // log options used getContext().debug( "options:" + - " eol=" + - ( eol == ASIS ? "asis" : eol == CR ? "cr" : eol == LF ? "lf" : "crlf" ) + - " tab=" + ( tabs == TABS ? "add" : tabs == ASIS ? "asis" : "remove" ) + - " eof=" + ( ctrlz == ADD ? "add" : ctrlz == ASIS ? "asis" : "remove" ) + - " tablength=" + tablength + - " encoding=" + ( encoding == null ? "default" : encoding ) ); + " eol=" + + ( eol == ASIS ? "asis" : eol == CR ? "cr" : eol == LF ? "lf" : "crlf" ) + + " tab=" + ( tabs == TABS ? "add" : tabs == ASIS ? "asis" : "remove" ) + + " eof=" + ( ctrlz == ADD ? "add" : ctrlz == ASIS ? "asis" : "remove" ) + + " tablength=" + tablength + + " encoding=" + ( encoding == null ? "default" : encoding ) ); DirectoryScanner ds = super.getDirectoryScanner( srcDir ); String[] files = ds.getIncludedFiles(); 1.3 +2 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/Native2Ascii.java Index: Native2Ascii.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/Native2Ascii.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Native2Ascii.java 23 May 2002 01:50:28 -0000 1.2 +++ Native2Ascii.java 5 Jul 2002 03:22:02 -0000 1.3 @@ -10,10 +10,10 @@ import java.io.File; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; +import org.apache.myrmidon.framework.nativelib.ArgumentList; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.SourceFileScanner; -import org.apache.myrmidon.framework.nativelib.ArgumentList; import org.apache.tools.todo.util.mappers.IdentityMapper; / @@ -200,7 +200,7 @@ } private ArgumentList buildCommand( final File srcFile, - final File destFile ) + final File destFile ) { final ArgumentList cmd = new ArgumentList();// Command line to run // Set up the basic args (this could be done once, but 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/Replacefilter.java Index: Replacefilter.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/text/Replacefilter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Replacefilter.java 14 Apr 2002 09:31:52 -0000 1.1 +++ Replacefilter.java 5 Jul 2002 03:22:02 -0000 1.2 @@ -8,7 +8,6 @@ package org.apache.tools.todo.taskdefs.text; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.text.Replace; public class Replacefilter { 1.3 +1 -3 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSS.java Index: MSVSS.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSS.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MSVSS.java 6 May 2002 09:29:45 -0000 1.2 +++ MSVSS.java 5 Jul 2002 03:22:02 -0000 1.3 @@ -9,12 +9,10 @@ import java.io.File; import java.util.Properties; -import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.nativelib.Execute; -import org.apache.myrmidon.framework.nativelib.Commandline; import org.apache.myrmidon.framework.nativelib.ArgumentList; +import org.apache.myrmidon.framework.nativelib.Execute; / * A base class for creating tasks for executing commands on Visual SourceSafe. 1.3 +2 -4 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/types/ScannerUtil.java Index: ScannerUtil.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/types/ScannerUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ScannerUtil.java 6 May 2002 09:29:46 -0000 1.2 +++ ScannerUtil.java 5 Jul 2002 03:22:02 -0000 1.3 @@ -12,13 +12,11 @@ import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.PatternUtil; import org.apache.myrmidon.framework.FileSet; +import org.apache.myrmidon.framework.PatternUtil; import org.apache.tools.todo.taskdefs.archive.TarFileSet; import org.apache.tools.todo.taskdefs.archive.ZipFileSet; import org.apache.tools.todo.taskdefs.archive.ZipScanner; -import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileScanner; /** * 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/types/SysProperties.java Index: SysProperties.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/types/SysProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SysProperties.java 14 Apr 2002 09:31:52 -0000 1.1 +++ SysProperties.java 5 Jul 2002 03:22:02 -0000 1.2 @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.Iterator; -import java.util.Properties; import java.util.Map; +import java.util.Properties; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.nativelib.EnvironmentData; 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java Index: IdentityMapper.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IdentityMapper.java 14 Apr 2002 09:31:53 -0000 1.1 +++ IdentityMapper.java 5 Jul 2002 03:22:02 -0000 1.2 @@ -29,6 +29,6 @@ / public String[] mapFileName( final String sourceFileName, TaskContext context ) { - return new String[]{ sourceFileName }; + return new String[]{sourceFileName}; } } 1.2 +1 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java Index: MergingMapper.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MergingMapper.java 14 Apr 2002 09:31:53 -0000 1.1 +++ MergingMapper.java 5 Jul 2002 03:22:02 -0000 1.2 @@ -31,7 +31,7 @@ / public void setTo( final String to ) { - m_mergedFile = new String[]{ to }; + m_mergedFile = new String[]{to}; } / 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java Index: JakartaOroRegexp.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JakartaOroRegexp.java 14 Apr 2002 09:31:53 -0000 1.1 +++ JakartaOroRegexp.java 5 Jul 2002 03:22:02 -0000 1.2 @@ -11,7 +11,6 @@ import org.apache.oro.text.regex.Perl5Substitution; import org.apache.oro.text.regex.Substitution; import org.apache.oro.text.regex.Util; -import org.apache.tools.todo.util.regexp.JakartaOroMatcher; / * Regular expression implementation using the Jakarta Oro package 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java Index: JakartaRegexpRegexp.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JakartaRegexpRegexp.java 14 Apr 2002 09:31:53 -0000 1.1 +++ JakartaRegexpRegexp.java 5 Jul 2002 03:22:02 -0000 1.2 @@ -10,7 +10,6 @@ import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.regexp.RE; -import org.apache.tools.todo.util.regexp.JakartaRegexpMatcher; /** * Regular expression implementation using the Jakarta Regexp package 1.2 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java Index: Jdk14RegexpRegexp.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Jdk14RegexpRegexp.java 14 Apr 2002 09:31:53 -0000 1.1 +++ Jdk14RegexpRegexp.java 5 Jul 2002 03:22:02 -0000 1.2 @@ -10,7 +10,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.util.regexp.Jdk14RegexpMatcher; /** * Regular expression implementation using the JDK 1.4 regular expression 1.3 +1 -2 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/RegexpFactory.java Index: RegexpFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/RegexpFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RegexpFactory.java 23 May 2002 01:50:28 -0000 1.2 +++ RegexpFactory.java 5 Jul 2002 03:22:02 -0000 1.3 @@ -8,7 +8,6 @@ package org.apache.tools.todo.util.regexp; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.util.regexp.Regexp; /** * Regular expression factory, which will create Regexp objects. The actual 1.4 +0 -1 jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java Index: RegexpMatcherFactory.java =================================================================== RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RegexpMatcherFactory.java 23 May 2002 01:50:28 -0000 1.3 +++ RegexpMatcherFactory.java 5 Jul 2002 03:22:02 -0000 1.4 @@ -8,7 +8,6 @@ package org.apache.tools.todo.util.regexp; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.util.regexp.RegexpMatcher; /** * Simple Factory Class that produces an implementation of RegexpMatcher based -- To unsubscribe, e-mail: <mailto:ant-dev-unsubscribe@jakarta.apache.org> For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>
Mime	Unnamed text/plain (inline, None, 314375 bytes)
	View raw message