[Maven-plugins-cvs] cvs commit: maven-plugins/axis plugin.jelly

[Dominik D. <da...@us...>]

dahlemd     04/11/27 08:37:47

  Modified:    axis     Tag: dahlemd_axis_improvements_01-branch
                        plugin.jelly
  Log:
  made the mapping of namespaces a nested element of wsdl2java
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.4.1   +14 -7     maven-plugins/axis/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/axis/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- plugin.jelly	23 Oct 2004 16:21:33 -0000	1.2
  +++ plugin.jelly	27 Nov 2004 16:37:47 -0000	1.2.4.1
  @@ -17,7 +17,13 @@
       <ant:pathelement path="${plugin.getDependencyPath('saaj')}"/>
     </ant:path>
   
  -  <ant:taskdef classpath="${plugin.getDependencyPath('axis:axis-ant')}" resource="axis-tasks.properties" />
  +   <ant:taskdef resource="axis-tasks.properties" >
  +     <ant:classpath>
  +       <ant:pathelement location="${plugin.getDependencyPath('axis:axis-ant')}"/>
  +       <ant:path refid="maven.dependency.classpath"/>
  +     </ant:classpath>
  +   </ant:taskdef>
  +
   
     <j:set var="axis.build.dir"
       value="${maven.axis.build.dir}" />
  @@ -76,14 +82,15 @@
               typemappingVersion="${maven.axis.typemappingversion}"
               serverside="${maven.axis.serverside}"
               url="${wsdlFile}">
  -          </axis-wsdl2java>
   
             <!-- mapping of namespaces to package names -->
  -          <u:tokenize var="urnMappings" delim=",">${maven.wsdl2java.namespaceMappings}</u:tokenize>
  -          <j:forEach var="urnMapping" items="${urnMappings}">
  -            <u:tokenize var="keyValue" delim="=">${urnMapping}</u:tokenize>
  -            <mapping namespace="${keyValue[0]}" package="${keyValue[1]}"/>
  -          </j:forEach>
  +            <u:tokenize var="urnMappings" delim=",">${maven.wsdl2java.namespaceMappings}</u:tokenize>
  +            <j:forEach var="urnMapping" items="${urnMappings}">
  +              <u:tokenize var="keyValue" delim="=">${urnMapping}</u:tokenize>
  +              <mapping namespace="${keyValue[0]}" package="${keyValue[1]}"/>
  +            </j:forEach>
  +
  +          </axis-wsdl2java>
   
           </j:forEach>
         </j:if>