ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/tools/xsl build.xsl
Date Sun, 12 May 2002 04:03:33 GMT
adammurdoch    02/05/11 21:03:32

  Modified:    .        build.xml
               antlib   project.xml
               antlib/src/java/org/apache/antlib/core Log.java
               antlib/src/test/org/apache/antlib
                        AbstractProjectTestCase.java
               antlib/src/test/org/apache/antlib/core/test IfTestCase.java
                        PropertyTestCase.java
               container/src/java/org/apache/myrmidon/components/type
                        NamespaceAwareTypeFactory.java
               myrmidon project.xml
               myrmidon/src/samples namespace-test.ant
               tools/xsl build.xsl
  Added:       myrmidon/src/java/org/apache/antlib/selftest
                        ExtensionsTest.java LogTask2.java LogTask3.java
                        PrimitiveTypesTest.java
               myrmidon/src/java/org/apache/antlib/selftest/extension1
                        ExtensionsLoadedClass.java
  Removed:     antlib/src/java/org/apache/antlib/selftest
                        ExtensionsTest.java LogTask2.java LogTask3.java
                        PrimitiveTypesTest.java
               antlib/src/java/org/apache/antlib/selftest/extension1
                        ExtensionsLoadedClass.java
  Log:
  - Moved selftest from antlib project to myrmidon project, to get all
    those versions of <log> out of the way of the antlib unit tests.
  - Fixed the antlib unit tests (such as they are).
  
  Revision  Changes    Path
  1.17      +10 -0     jakarta-ant-myrmidon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml	9 May 2002 07:50:05 -0000	1.16
  +++ build.xml	12 May 2002 04:03:31 -0000	1.17
  @@ -50,6 +50,16 @@
               <param name="build-subproject.target" value="clean"/>
           </antcall>
       </target>
  +    <target name="clean-classes" description="Cleans all class files">
  +        <antcall target="-for-all-projects">
  +            <param name="build-subproject.target" value="clean-classes"/>
  +        </antcall>
  +    </target>
  +    <target name="clean-jars" description="Cleans all Jar files">
  +        <antcall target="-for-all-projects">
  +            <param name="build-subproject.target" value="clean-jars"/>
  +        </antcall>
  +    </target>
       <target name="rebuild" description="Rebuilds all projects">
           <antcall target="-for-all-projects">
               <param name="build-subproject.target" value="rebuild"/>
  
  
  
  1.8       +1 -21     jakarta-ant-myrmidon/antlib/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	10 May 2002 06:27:31 -0000	1.7
  +++ project.xml	12 May 2002 04:03:32 -0000	1.8
  @@ -1,5 +1,5 @@
   <project>
  -    <name>Myrmidon Task Libraries</name>
  +    <name>Myrmidon Type Libraries</name>
       <id>myrmidon-antlibs</id>
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2000-2002</copyrightYear>
  @@ -72,26 +72,6 @@
           </jar>
           <jar>
               <id>security</id>
  -            <patternset includes="org/apache/antlib/security/**"/>
  -        </jar>
  -        <jar>
  -            <id>selftest</id>
  -            <patternset includes="org/apache/antlib/selftest/**"/>
  -            <depends>
  -                <extension extension-name="selftest.extension"
  -                           specification-version="1.0"
  -                           implementation-version="1.0.2"
  -                           implementation-vendor-id="org.apache.avalon"/>
  -                <extension extension-name="com.sun.tools"
  -                           implementation-version="1.0"/>
  -            </depends>
  -        </jar>
  -        <jar>
  -            <id>selftest-extension</id>
  -            <extension extension-name="selftest.extension"
  -                       specification-version="1.0"
  -                       implementation-version="1.0.2"
  -                       implementation-vendor-id="org.apache.avalon"/>
               <patternset includes="org/apache/antlib/security/**"/>
           </jar>
           <jar>
  
  
  
  1.2       +9 -1      jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/Log.java
  
  Index: Log.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/Log.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Log.java	14 Apr 2002 10:55:08 -0000	1.1
  +++ Log.java	12 May 2002 04:03:32 -0000	1.2
  @@ -64,7 +64,7 @@
       public void execute()
           throws TaskException
       {
  -        LogLevel.log( getContext(), m_level, m_message );
  +        LogLevel.log( getContext(), m_level, getMessage() );
       }
   
       /**
  @@ -78,5 +78,13 @@
                   "either nested content or the message attribute";
               throw new IllegalStateException( message );
           }
  +    }
  +
  +    /**
  +     * Returns the message to log.
  +     */
  +    protected String getMessage()
  +    {
  +        return m_message;
       }
   }
  
  
  
  1.2       +15 -3     jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/AbstractProjectTestCase.java
  
  Index: AbstractProjectTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/test/org/apache/antlib/AbstractProjectTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractProjectTestCase.java	11 May 2002 12:44:00 -0000	1.1
  +++ AbstractProjectTestCase.java	12 May 2002 04:03:32 -0000	1.2
  @@ -17,7 +17,7 @@
    * A base class for test cases which need to execute projects or tasks.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/05/11 12:44:00 $
  + * @version $Revision: 1.2 $ $Date: 2002/05/12 04:03:32 $
    */
   public class AbstractProjectTestCase
       extends AbstractAutTestCase
  @@ -28,6 +28,15 @@
       }
   
       /**
  +     * Executes a target in a project, and asserts that it fails.
  +     */
  +    protected void executeTargetExpectError( final File projectFile,
  +                                             final String targetName )
  +    {
  +        executeTargetExpectError( projectFile, targetName, new String[ 0 ] );
  +    }
  +
  +    /**
        * Executes a target in a project, and asserts that it fails with the
        * given error message.
        */
  @@ -51,9 +60,12 @@
               executeTarget( projectFile, targetName, null );
               fail( "target execution did not fail" );
           }
  -        catch( Exception e )
  +        catch( final Exception e )
           {
  -            assertSameMessage( messages, e );
  +            // Add in the 'could not execute task <blah>' messages
  +            final String[] allMessages = new String[ 2 + messages.length ];
  +            System.arraycopy( messages, 0, allMessages, 2, messages.length );
  +            assertSameMessage( allMessages, e );
           }
       }
   
  
  
  
  1.4       +9 -14     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IfTestCase.java	11 May 2002 12:44:00 -0000	1.3
  +++ IfTestCase.java	12 May 2002 04:03:32 -0000	1.4
  @@ -16,7 +16,7 @@
    * Test cases for the <if> task.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.3 $ $Date: 2002/05/11 12:44:00 $
  + * @version $Revision: 1.4 $ $Date: 2002/05/12 04:03:32 $
    */
   public class IfTestCase
       extends AbstractProjectTestCase
  @@ -42,7 +42,7 @@
           executeTarget( projectFile, "true-prop", listener );
   
           // Test when property is set to a value other than 'true' or 'false'
  -        executeTargetExpectError( projectFile, "set-prop", new String[ 0 ] );
  +        executeTargetExpectError( projectFile, "set-prop" );
   
           // Test when property is set to 'false'
           listener = new LogMessageTracker();
  @@ -97,24 +97,19 @@
           final File projectFile = getTestResource( "if.ant" );
   
           // Check for missing condition
  -        String[] messages = {
  -            null,
  -            REZ.getString( "if.no-condition.error" )
  -        };
  -        executeTargetExpectError( projectFile, "no-condition", messages );
  +        String message = REZ.getString( "if.no-condition.error" );
  +        executeTargetExpectError( projectFile, "no-condition", message );
   
           // Check for too many conditions
  -        messages = new String[]
  -        {
  -            null,
  -            null,
  -            REZ.getString( "if.ifelse-duplicate.error" )
  -        };
  +        message = REZ.getString( "if.ifelse-duplicate.error" );
  +        String[] messages = { null, message };
  +
           // 2 condition attributes.
           executeTargetExpectError( projectFile, "too-many-conditions", messages );
   
           // attribute condition + nested condition
  -        executeTargetExpectError( projectFile, "attribute-plus-nested-condition",
  +        executeTargetExpectError( projectFile,
  +                                  "attribute-plus-nested-condition",
                                     messages );
   
           // 2 nested conditions
  
  
  
  1.4       +15 -39    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropertyTestCase.java	11 May 2002 12:44:00 -0000	1.3
  +++ PropertyTestCase.java	12 May 2002 04:03:32 -0000	1.4
  @@ -18,7 +18,7 @@
    * Test cases for <property> task.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.3 $ $Date: 2002/05/11 12:44:00 $
  + * @version $Revision: 1.4 $ $Date: 2002/05/12 04:03:32 $
    */
   public class PropertyTestCase
       extends AbstractProjectTestCase
  @@ -64,28 +64,16 @@
           final File projectFile = getTestResource( "property.ant" );
   
           // Missing name
  -        String[] messages =
  -            {
  -                null,
  -                REZ.getString( "property.no-name.error" )
  -            };
  -        executeTargetExpectError( projectFile, "missing-name", messages );
  +        String message = REZ.getString( "property.no-name.error" );
  +        executeTargetExpectError( projectFile, "missing-name", message );
   
           // Missing value
  -        messages = new String[]
  -        {
  -            null,
  -            REZ.getString( "property.no-value.error" )
  -        };
  -        executeTargetExpectError( projectFile, "missing-value", messages );
  +        message = REZ.getString( "property.no-value.error" );
  +        executeTargetExpectError( projectFile, "missing-value", message );
   
           // Too many values
  -        messages = new String[]
  -        {
  -            null,
  -            null,
  -            REZ.getString( "property.multi-set.error" )
  -        };
  +        message = REZ.getString( "property.multi-set.error" );
  +        String[] messages = { null, message };
           executeTargetExpectError( projectFile, "too-many-values1", messages );
           executeTargetExpectError( projectFile, "too-many-values2", messages );
           executeTargetExpectError( projectFile, "too-many-values3", messages );
  @@ -105,26 +93,14 @@
   	//ResourceManager.getPackageResources( DefaultPropertyStore.class );
   
           // Invalid names
  -        String[] messages = new String[]
  -        {
  -            null,
  -            rez.getString( "bad-property-name.error", "badname!" )
  -        };
  -        executeTargetExpectError( projectFile, "bad-prop-name1", messages );
  -
  -        messages = new String[]
  -        {
  -            null,
  -            rez.getString( "bad-property-name.error", "bad name" )
  -        };
  -        executeTargetExpectError( projectFile, "bad-prop-name2", messages );
  -
  -        messages = new String[]
  -        {
  -            null,
  -            rez.getString( "bad-property-name.error", "" )
  -        };
  -        executeTargetExpectError( projectFile, "bad-prop-name3", messages );
  +        String message = rez.getString( "bad-property-name.error", "badname!" );
  +        executeTargetExpectError( projectFile, "bad-prop-name1", message );
  +
  +        message = rez.getString( "bad-property-name.error", "bad name" );
  +        executeTargetExpectError( projectFile, "bad-prop-name2", message );
  +
  +        message = rez.getString( "bad-property-name.error", "" );
  +        executeTargetExpectError( projectFile, "bad-prop-name3", message );
       }
   
   }
  
  
  
  1.4       +5 -5      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NamespaceAwareTypeFactory.java	10 May 2002 01:44:47 -0000	1.3
  +++ NamespaceAwareTypeFactory.java	12 May 2002 04:03:32 -0000	1.4
  @@ -24,7 +24,7 @@
    * searched for a type matching the type name.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.3 $ $Date: 2002/05/10 01:44:47 $
  + * @version $Revision: 1.4 $ $Date: 2002/05/12 04:03:32 $
    */
   class NamespaceAwareTypeFactory
       extends AbstractTypeFactory
  @@ -44,7 +44,7 @@
   
       private NamespaceAwareTypeFactory m_parent;
   
  -    private Map m_mulitSourceTypeFactories = new HashMap();
  +    private Map m_multiSourceTypeFactories = new HashMap();
       private Map m_aggregatingTypeFactories = new HashMap();
   
       /**
  @@ -161,12 +161,12 @@
           // Get a multi-source factory for this namespace/role,
           // creating and adding to the namespace -> factory map if necessary.
           MultiSourceTypeFactory namespaceFactory =
  -            (MultiSourceTypeFactory)m_mulitSourceTypeFactories.get( namespace );
  +            (MultiSourceTypeFactory)m_multiSourceTypeFactories.get( namespace );
   
           if( namespaceFactory == null )
           {
               namespaceFactory = new MultiSourceTypeFactory( m_role.getImplementationClass()
);
  -            m_mulitSourceTypeFactories.put( namespace, namespaceFactory );
  +            m_multiSourceTypeFactories.put( namespace, namespaceFactory );
           }
   
           // Register the type with the namespace-specific multisource factory.
  @@ -264,7 +264,7 @@
           throws TypeException
       {
           // First search in the individually registered types
  -        TypeFactory factory = findLocalFactory( qname, m_mulitSourceTypeFactories );
  +        TypeFactory factory = findLocalFactory( qname, m_multiSourceTypeFactories );
           if ( factory == null )
           {
               // Then in the factory-registered types.
  
  
  
  1.6       +34 -2     jakarta-ant-myrmidon/myrmidon/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/myrmidon/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	10 May 2002 06:27:32 -0000	1.5
  +++ project.xml	12 May 2002 04:03:32 -0000	1.6
  @@ -4,6 +4,38 @@
       <currentVersion>1.0</currentVersion>
       <copyrightYear>2000-2002</copyrightYear>
   
  +    <build>
  +        <classpath>
  +            <fileset dir="../api/build/lib" includes="*.jar"/>
  +            <fileset dir="../framework/build/lib" includes="*.jar"/>
  +            <fileset dir="../antlib/build/lib" includes="*.jar"/>
  +            <fileset dir="../lib" includes="*.jar"/>
  +        </classpath>
  +
  +        <sourceDirectory>src/java</sourceDirectory>
  +        <jar>
  +            <id>selftest</id>
  +            <patternset includes="org/apache/antlib/selftest/*"/>
  +            <depends>
  +                <extension extension-name="core" implementation-version="1.0"/>
  +                <extension extension-name="selftest.extension"
  +                           specification-version="1.0"
  +                           implementation-version="1.0.2"
  +                           implementation-vendor-id="org.apache.avalon"/>
  +                <extension extension-name="com.sun.tools"
  +                           implementation-version="1.0"/>
  +            </depends>
  +        </jar>
  +        <jar>
  +            <id>selftest-extension</id>
  +            <extension extension-name="selftest.extension"
  +                       specification-version="1.0"
  +                       implementation-version="1.0.2"
  +                       implementation-vendor-id="org.apache.avalon"/>
  +            <patternset includes="org/apache/antlib/selftest/extension1/*"/>
  +        </jar>
  +    </build>
  +
       <dist>
           <!-- lib/ dir -->
           <mkdir dir="${dist.dir}/lib"/>
  @@ -19,7 +51,7 @@
           <!-- lib/core/ dir -->
           <mkdir dir="${dist.dir}/lib/core"/>
           <copy todir="${dist.dir}/lib/core">
  -            <fileset dir="../antlib/build/lib" includes="*.jar" excludes="selftest*"/>
  +            <fileset dir="../antlib/build/lib" includes="*.jar"/>
           </copy>
   
           <!-- bin/ dir -->
  @@ -44,7 +76,7 @@
           <!-- ext/ dir -->
           <mkdir dir="${dist.dir}/ext"/>
           <copy todir="${dist.dir}/ext">
  -            <fileset dir="../antlib/build/lib" includes="selftest*"/>
  +            <fileset dir="${build.lib}" includes="*.jar"/>
               <fileset dir="../lib/ext" includes="*.jar"/>
               <fileset dir="../ant1compat/build/lib" includes="*.jar"/>
           </copy>
  
  
  
  1.1                  jakarta-ant-myrmidon/myrmidon/src/java/org/apache/antlib/selftest/ExtensionsTest.java
  
  Index: ExtensionsTest.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.antlib.selftest;
  
  import org.apache.antlib.selftest.extension1.ExtensionsLoadedClass;
  import org.apache.myrmidon.api.AbstractTask;
  import org.apache.myrmidon.api.TaskException;
  
  /**
   * This is to test whether extension is loaded.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @ant.task name="extensions-test"
   */
  public class ExtensionsTest
      extends AbstractTask
  {
      public void execute()
          throws TaskException
      {
          ExtensionsLoadedClass.doSomething();
  
          Class clazz = null;
          try
          {
              clazz = Class.forName( "sun.tools.javac.Main" );
          }
          catch( ClassNotFoundException e )
          {
              try
              {
                  clazz = Class.forName( "com.sun.tools.javac.Main" );
              }
              catch( ClassNotFoundException e1 )
              {
                  throw new TaskException( "Unable to locate compilers from tools.jar" );
              }
          }
  
          System.out.println( "Compiler loaded from tools.jar = " + clazz );
      }
  }
  
  
  
  1.1                  jakarta-ant-myrmidon/myrmidon/src/java/org/apache/antlib/selftest/LogTask2.java
  
  Index: LogTask2.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.antlib.selftest;
  
  import org.apache.antlib.core.Log;
  
  /**
   * An override version of the "log" task, to test namespace resolution.
   * This is a copy of org.apache.antlib.core.Log, with minor alterations,
   * which allows a prefixed message to be logged.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
   * @ant.task name="log"
   */
  public class LogTask2
      extends Log
  {
      /**
       * Returns the message to log.
       */
      protected String getMessage()
      {
          return "[Log2]" + super.getMessage();
      }
  
  }
  
  
  
  1.1                  jakarta-ant-myrmidon/myrmidon/src/java/org/apache/antlib/selftest/LogTask3.java
  
  Index: LogTask3.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included  with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.antlib.selftest;
  
  import org.apache.antlib.core.Log;
  
  /**
   * A version of Log task, which is used to test namespace resolution.
   * This task is not declared as part of the antlib (no xdoclet tag),
   * so it can be expicitly type-def'd.
   *
   * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
   * @version $Revision: 1.1 $ $Date: 2002/05/12 04:03:32 $
   */
  public class LogTask3
      extends Log
  {
      /**
       * Returns the message to log.
       */
      protected String getMessage()
      {
          return "[Log3]" + super.getMessage();
      }
  }
  
  
  
  1.1                  jakarta-ant-myrmidon/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
  
  Index: PrimitiveTypesTest.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.antlib.selftest;
  
  import org.apache.myrmidon.api.AbstractTask;
  import org.apache.myrmidon.api.TaskException;
  
  /**
   * Test conversion of all the primitive types.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @ant.task name="prim-test"
   */
  public class PrimitiveTypesTest
      extends AbstractTask
  {
      public void setInteger( final Integer value )
      {
          getContext().info( "setInteger( " + value + " );" );
      }
  
      public void setInteger2( final int value )
      {
          getContext().info( "setInteger2( " + value + " );" );
      }
  
      public void setShort( final Short value )
      {
          getContext().info( "setShort( " + value + " );" );
      }
  
      public void setShort2( final short value )
      {
          getContext().info( "setShort2( " + value + " );" );
      }
  
      public void setByte( final Byte value )
      {
          getContext().info( "setByte( " + value + " );" );
      }
  
      public void setByte2( final byte value )
      {
          getContext().info( "setByte2( " + value + " );" );
      }
  
      public void setLong( final Long value )
      {
          getContext().info( "setLong( " + value + " );" );
      }
  
      public void setLong2( final long value )
      {
          getContext().info( "setLong2( " + value + " );" );
      }
  
      public void setFloat( final Float value )
      {
          getContext().info( "setFloat( " + value + " );" );
      }
  
      public void setFloat2( final float value )
      {
          getContext().info( "setFloat2( " + value + " );" );
      }
  
      public void setDouble( final Double value )
      {
          getContext().info( "setDouble( " + value + " );" );
      }
  
      public void setDouble2( final double value )
      {
          getContext().info( "setDouble2( " + value + " );" );
      }
  
      public void setString( final String value )
      {
          getContext().info( "setString( " + value + " );" );
      }
  
      public void execute()
          throws TaskException
      {
      }
  }
  
  
  
  1.1                  jakarta-ant-myrmidon/myrmidon/src/java/org/apache/antlib/selftest/extension1/ExtensionsLoadedClass.java
  
  Index: ExtensionsLoadedClass.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.antlib.selftest.extension1;
  
  /**
   * This is to test whether extension is loaded.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   */
  public class ExtensionsLoadedClass
  {
      public static void doSomething()
      {
          System.out.println( "This was loaded via an extension - yea!" );
      }
  }
  
  
  
  1.3       +1 -1      jakarta-ant-myrmidon/myrmidon/src/samples/namespace-test.ant
  
  Index: namespace-test.ant
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/myrmidon/src/samples/namespace-test.ant,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- namespace-test.ant	10 May 2002 01:44:48 -0000	1.2
  +++ namespace-test.ant	12 May 2002 04:03:32 -0000	1.3
  @@ -41,7 +41,7 @@
               namespace="task-deffed"
               role="task"
               classname="org.apache.antlib.selftest.LogTask3"
  -            classpath="../../dist/ext/selftest.atl" />
  +            classpath="../ext/selftest-1.0.jar" />
   
           <log message="message"/> <!-- selftest.LogTask3 -->
           <core.log message="message"/> <!-- core.Log -->
  
  
  
  1.15      +3 -0      jakarta-ant-myrmidon/tools/xsl/build.xsl
  
  Index: build.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/tools/xsl/build.xsl,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xsl	11 May 2002 12:34:40 -0000	1.14
  +++ build.xsl	12 May 2002 04:03:32 -0000	1.15
  @@ -100,6 +100,9 @@
                   <delete dir="${{build.classes}}"/>
                   <delete dir="${{test.classes}}"/>
               </target>
  +            <target name="clean-jars" description="Cleans all Jar files">
  +                <delete dir="${{build.lib}}"/>
  +            </target>
   
               <target name="real-clean" depends="clean" description="Cleans up the project,
including distributions">
                   <delete dir="${{dist.base}}" />
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message