djencks     2004/02/08 11:37:00

  Modified:    modules/maven-xmlbeans-plugin maven.xml plugin.jelly
                        project.xml
               specs/schema project.xml
  Log:
  make xmlbeans plugin work slightly better if it generates all source files
  
  Revision  Changes    Path
  1.4       +2 -1      incubator-geronimo/modules/maven-xmlbeans-plugin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	3 Feb 2004 16:41:59 -0000	1.3
  +++ maven.xml	8 Feb 2004 19:37:00 -0000	1.4
  @@ -27,6 +27,7 @@
   
       <goal name="default">
           <attainGoal name="plugin:install"/>
  +        <attainGoal name="plugin:deploy"/>
       </goal>
   
       <goal name="build">
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/maven-xmlbeans-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly	5 Feb 2004 20:33:28 -0000	1.2
  +++ plugin.jelly	8 Feb 2004 19:37:00 -0000	1.3
  @@ -47,13 +47,13 @@
                   </j:if>
   
                   <j:if test="${context.antProject.getReference('maven.compile.src.set') != null}">
  -                    <ant:path id="maven.xmlbeans.compile.src.set"
  +                    <path id="maven.xmlbeans.compile.src.set"
                           location="${targetdir}"/>
                       <maven:addPath id="maven.compile.src.set"
                           refid="maven.xmlbeans.compile.src.set"/>
                   </j:if>
                   <j:if test="${context.antProject.getReference('maven.compile.src.set') == null}">
  -                    <ant:path id="maven.compile.src.set" location="${targetdir}"/>
  +                    <echo message="Maven cannot find the generated sources unless you provide a dummy source directory in project.xml"/>
                   </j:if>
   
   
  
  
  
  1.2       +1 -1      incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/maven-xmlbeans-plugin/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	2 Feb 2004 22:04:21 -0000	1.1
  +++ project.xml	8 Feb 2004 19:37:00 -0000	1.2
  @@ -3,7 +3,7 @@
       <pomVersion>3</pomVersion>
       <id>geronimo-maven-xmlbeans-plugin</id>
       <name>Geronimo maven xmlbeans plugin</name>
  -    <groupId>geronimo</groupId>
  +    <groupId>maven</groupId>
       <currentVersion>DEV</currentVersion>
       <organization>
           <name>Apache Software Foundation</name>
  
  
  
  1.3       +4 -11     incubator-geronimo/specs/schema/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/specs/schema/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	6 Feb 2004 05:28:28 -0000	1.2
  +++ project.xml	8 Feb 2004 19:37:00 -0000	1.3
  @@ -11,7 +11,8 @@
       <!-- ===================== -->
   
       <name>Geronimo :: J2eeSchema</name>
  -    <id>geronimo-j2eeschema</id>
  +    <groupId>geronimo-spec</groupId>
  +    <id>geronimo-spec-j2eeschema</id>
       <shortDescription>Geronimo XMLBeans Schema</shortDescription>
       <description>Geronimo XMLBeans schema</description>
       <url>http://incubator.apache.org/projects/geronimo/schema/</url>
  @@ -36,16 +37,8 @@
               </properties>
           </dependency>
   
  -        <!--dependency>
  -            <groupId>maven</groupId>
  -            <artifactId>geronimo-maven-xmlbeans-plugin</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -            </properties>
  -        </dependency-->
  -
       </dependencies>
       <build>
  -        <sourceDirectory>${basedir}/target/xmlbeans</sourceDirectory>
  +        <sourceDirectory>${basedir}/src</sourceDirectory>
       </build>
   </project>