Return-Path: 
 <geronimo-cvs-return-920-apmail-incubator-geronimo-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org
Received: (qmail 38844 invoked from network); 1 Sep 2003 22:27:34 -0000
Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 1 Sep 2003 22:27:34 -0000
Received: (qmail 55713 invoked by uid 500); 1 Sep 2003 22:26:15 -0000
Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org
Received: (qmail 55682 invoked by uid 500); 1 Sep 2003 22:26:15 -0000
Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:geronimo-cvs-help@incubator.apache.org>
list-unsubscribe: <mailto:geronimo-cvs-unsubscribe@incubator.apache.org>
list-post: <mailto:geronimo-cvs@incubator.apache.org>
Reply-To: geronimo-dev@incubator.apache.org
Delivered-To: mailing list geronimo-cvs@incubator.apache.org
Received: (qmail 55636 invoked from network); 1 Sep 2003 22:26:14 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 1 Sep 2003 22:26:14 -0000
Received: (qmail 56840 invoked by uid 1715); 1 Sep 2003 18:26:11 -0000
Date: 1 Sep 2003 18:26:11 -0000
Message-ID: <20030901182611.56839.qmail@minotaur.apache.org>
From: jdillon@apache.org
To: incubator-geronimo-cvs@apache.org
Subject: cvs commit: incubator-geronimo/modules/twiddle maven.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

jdillon     2003/09/01 11:26:11

  Modified:    etc      maven.xml
               modules/twiddle maven.xml
  Log:
   o use common:castor tags for castor source gen
  
  Revision  Changes    Path
  1.17      +0 -0      incubator-geronimo/etc/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  
  
  
  1.6       +8 -36     incubator-geronimo/modules/twiddle/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/twiddle/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	16 Aug 2003 15:14:12 -0000	1.5
  +++ maven.xml	1 Sep 2003 18:26:11 -0000	1.6
  @@ -4,48 +4,20 @@
   
   <project default="default"
     xmlns:j="jelly:core"
  -  xmlns:u="jelly:util"
     xmlns:ant="jelly:ant"
  -  xmlns:castor="castor">
  +  xmlns:castor="common:castor">
     
     <!-- ================================= -->
     <!-- Compile XML->Java Binding Sources -->
     <!-- ================================= -->
     
     <preGoal name="java:compile">
  -    <attainGoal name="castor:prepare-filesystem"/>
  -      
  -    <!-- this does not currently support -binding-file 
  -    <castor:generate schema="${basedir}/src/schema/twiddle-configuration.xsd"
  -                     package="org.apache.geronimo.twiddle.config"
  -                     marshal="false"
  -                     types="j2"/>
  -    -->
  -    
  -    <j:set var="schema" value="${basedir}/src/schema/twiddle-configuration.xsd"/>
  -    <j:set var="gen" value="${pom.getPluginContext('maven-castor-plugin').getVariable('maven.castor.dest')}"/>
  -
  -    <ant:path id="castor.classpath">
  -      <ant:path refid="maven.dependency.classpath"/>
  -    </ant:path>
  -     
  -    <ant:java className="org.exolab.castor.builder.SourceGenerator"
  -              failonerror="true" fork="yes">
  -      <ant:classpath refid="castor.classpath"/>
  -      <ant:arg value="-i"/>
  -      <ant:arg value="${schema}"/>
  -      <ant:arg value="-binding-file"/>
  -      <ant:arg value="${basedir}/src/etc/twiddle-configuration-binding.xml"/>
  -      <ant:arg value="-package"/>
  -      <ant:arg value="org.apache.geronimo.twiddle.config"/>
  -      <ant:arg value="-types"/>
  -      <ant:arg value="j2"/>
  -      <ant:arg value="-nomarshall"/>
  -      <ant:arg value="-f"/>
  -      <ant:arg value="-dest"/>
  -      <ant:arg value="${gen}"/>
  -    </ant:java>
  -    
  +    <castor:generate
  +      schema="${basedir}/src/schema/twiddle-configuration.xsd"
  +      binding="${basedir}/src/etc/twiddle-configuration-binding.xml"
  +      package="org.apache.geronimo.twiddle.config"
  +      marshal="false"
  +      types="j2"/>
     </preGoal>
   
   </project>