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/tools/xsl build.xsl
Date Sun, 23 Jun 2002 08:26:31 GMT
donaldp     2002/06/23 01:26:31

  Modified:    buildtools/src/java/org/apache/myrmidon/build
                        AntlibDescriptorTask.java
               container/src/java/org/apache/myrmidon/components/deployer
                        DefaultTypeLibraryDeployer.java
               lib      excalibur-converter-1.1.jar
               tools/xsl build.xsl
  Added:       buildtools/src/conf ant-types.xml
               buildtools/src/java/org/apache/myrmidon/build ant-types.j
               container/src/test/org/apache/myrmidon/components/deployer/test
                        ant-types.xml
  Removed:     buildtools/src/conf ant-descriptor.xml
               buildtools/src/java/org/apache/myrmidon/build
                        ant-descriptor.j
               container/src/test/org/apache/myrmidon/components/deployer/test
                        ant-descriptor.xml
  Log:
  Rename ant-descriptor.xml to ant-types.xml as it was not a descriptor for ant but a list
of types.
  
  Originally renamed to -descriptor as we were going to merge the descriptors but this does
not seem to be on the plate anymore.
  
  Revision  Changes    Path
  1.1                  jakarta-ant-myrmidon/buildtools/src/conf/ant-types.xml
  
  Index: ant-types.xml
  ===================================================================
  <ant-lib version="1.0">
      <types>
          <task name="antlib-descriptor" classname="org.apache.myrmidon.build.AntlibDescriptorTask"/>
          <task name="antlib" classname="org.apache.myrmidon.build.AntlibJarTask"/>
      </types>
  </ant-lib>
  
  
  1.10      +1 -1      jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntlibDescriptorTask.java
  
  Index: AntlibDescriptorTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntlibDescriptorTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AntlibDescriptorTask.java	12 Jun 2002 06:51:04 -0000	1.9
  +++ AntlibDescriptorTask.java	23 Jun 2002 08:26:31 -0000	1.10
  @@ -20,7 +20,7 @@
   public class AntlibDescriptorTask
       extends DocletTask
   {
  -    private static final String DESCRIPTOR_TEMPLATE = "/org/apache/myrmidon/build/ant-descriptor.j";
  +    private static final String DESCRIPTOR_TEMPLATE = "/org/apache/myrmidon/build/ant-types.j";
       private static final String ROLES_TEMPLATE = "/org/apache/myrmidon/build/ant-roles.j";
       private static final String TYPES_TEMPLATE = "/org/apache/myrmidon/build/types.j";
   
  
  
  
  1.1                  jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-types.j
  
  Index: ant-types.j
  ===================================================================
  <ant-lib version="1.0">
  
    <types>
  
      <XDtClass:forAllClasses extent="concrete-type">
  
        <XDtAnt:forAllTypeTags>
          <<XDtAnt:typeTagRoleName/> name="<XDtAnt:typeTagTypeName/>"
                impl="<XDtClass:fullClassName/>"/>
        </XDtAnt:forAllTypeTags>
  
        <XDtClass:forAllClassTags tagName="ant.service-factory" superclasses="false">
          <service-factory name="<XDtClass:classTagValue tagName="ant.service-factory"
paramName="role"/>"
                impl="<XDtClass:fullClassName/>"/>
        </XDtClass:forAllClassTags>
  
        <XDtClass:forAllClassTags tagName="ant.converter" superclasses="false">
          <converter impl="<XDtClass:fullClassName/>"
                     source="<XDtClass:classTagValue tagName="ant.converter" paramName="source"/>"
                     destination="<XDtClass:classTagValue tagName="ant.converter" paramName="destination"/>"/>
        </XDtClass:forAllClassTags>
  
      </XDtClass:forAllClasses>
  
    </types>
  
  </ant-lib>
  
  
  
  1.11      +2 -2      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/DefaultTypeLibraryDeployer.java
  
  Index: DefaultTypeLibraryDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/DefaultTypeLibraryDeployer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultTypeLibraryDeployer.java	23 Jun 2002 07:43:05 -0000	1.10
  +++ DefaultTypeLibraryDeployer.java	23 Jun 2002 08:26:31 -0000	1.11
  @@ -43,7 +43,7 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( DefaultTypeLibraryDeployer.class );
   
  -    private static final String TYPE_DESCRIPTOR_NAME = "META-INF/ant-descriptor.xml";
  +    private static final String TYPE_DESCRIPTOR_NAME = "META-INF/ant-types.xml";
       private static final String ROLE_DESCRIPTOR_NAME = "META-INF/ant-roles.xml";
   
       private final TypeDeployer m_typeDeployer;
  
  
  
  1.1                  jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/deployer/test/ant-types.xml
  
  Index: ant-types.xml
  ===================================================================
  <ant-lib version="1.0">
  
      <types>
          <!-- Register a data-type -->
          <test-data-type name="test-type1"
                     impl="org.apache.myrmidon.components.deployer.test.TestType1"/>
  
          <!-- Register a custom role implementation -->
          <test-role1 name="test-type1"
                      impl="org.apache.myrmidon.components.deployer.test.TestType1"/>
  
          <!-- Register a converter -->
          <converter impl="org.apache.myrmidon.components.deployer.test.TestConverter1"
                     source="java.lang.String"
                     destination="org.apache.myrmidon.components.deployer.test.TestType1"/>
      </types>
  
  </ant-lib>
  
  
  
  1.3       +86 -81    jakarta-ant-myrmidon/lib/excalibur-converter-1.1.jar
  
  	<<Binary file>>
  
  
  1.26      +3 -3      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xsl	11 Jun 2002 03:52:58 -0000	1.25
  +++ build.xsl	23 Jun 2002 08:26:31 -0000	1.26
  @@ -193,7 +193,7 @@
                           <xsl:if test="not(unitTest/includeDescriptors = 'false')">
                               <antlib-descriptor
                                   destdir="${{test.classes}}/META-INF"
  -                                descriptorName="ant-descriptor.xml"
  +                                descriptorName="ant-types.xml"
                                   rolesDescriptorName="ant-roles.xml">
                                   <fileset dir="{unitTest/sourceDirectory}">
                                       <patternset refid="project.test.patternset"/>
  @@ -431,7 +431,7 @@
               </target>
   
               <target name="jar-{id}-prepare" depends="jar-{id}-test-omit" unless="{id}-xdoclet.omit">
  -                <uptodate targetfile="${{build.conf}}/{id}/ant-descriptor.xml"
  +                <uptodate targetfile="${{build.conf}}/{id}/ant-types.xml"
                       property="{id}-xdoclet.omit">
                       <xsl:for-each select="../sourceDirectory">
                           <srcfiles dir="{.}">
  @@ -448,7 +448,7 @@
                       <mkdir dir="${{build.conf}}/{id}"/>
                       <antlib-descriptor
                           destdir="${{build.conf}}/{id}"
  -                        descriptorName="ant-descriptor.xml"
  +                        descriptorName="ant-types.xml"
                           rolesDescriptorName="ant-roles.xml">
                           <xsl:for-each select="../sourceDirectory">
                               <fileset dir="{.}">
  
  
  

--
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