geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/core maven.xml project.xml
Date Mon, 01 Sep 2003 19:47:39 GMT
jdillon     2003/09/01 12:47:39

  Modified:    modules/core maven.xml project.xml
  Log:
   o Enable XDoclet for MBean intf generation
  
  Revision  Changes    Path
  1.16      +30 -59    incubator-geronimo/modules/core/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- maven.xml	29 Aug 2003 12:36:51 -0000	1.15
  +++ maven.xml	1 Sep 2003 19:47:39 -0000	1.16
  @@ -6,40 +6,25 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
  -  xmlns:castor="castor">
  +  xmlns:xdoclet="common:xdoclet"
  +  xmlns:castor="common:castor">>
   
     <preGoal name="xdoc:jelly-transform">
       <attainGoal name="html2xdoc"/>
     </preGoal>
  -
  +  
     <preGoal name="java:compile">
  -    <attainGoal name="castor:prepare-filesystem"/>
  -      
  -    <j:set var="schema" value="${basedir}/src/schema/geronimo-ejb-jar.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="-package"/>
  -      <ant:arg value="org.apache.geronimo.enterprise.deploy.common"/>
  -      <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>
  +    <attainGoal name="xdoclet:jmxdoclet:compile"/>
  +  </preGoal>
       
  +  <preGoal name="java:compile">
  +    <castor:generate
  +      schema="${basedir}/src/schema/geronimo-ejb-jar.xsd"
  +      package="org.apache.geronimo.enterprise.deploy.common"
  +      types="j2"/>
     </preGoal>
   
  -  <postGoal name="java:compile">
  +  <postGoal name="jar:jar">
       <ant:jar destfile="${basedir}/target/jsr88-geronimo-plugin.jar"
                basedir="${basedir}/target/classes"
                includes="org/apache/geronimo/enterprise/deploy/provider/**/*.class"
  @@ -52,39 +37,25 @@
                includes="org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.class"/>
     </postGoal>
     
  -  <preGoal name="java:compile">
  -    <!--
  -    <j:set var="maven.javacc.compile.src" value="target/gen-src"/>
  -    <ant:path id="maven.javacc.compile.src.set" location="${maven.javacc.compile.src}"/>
  -    <maven:addPath id="maven.compile.src.set" refid="maven.javacc.compile.src.set"/>
  -
  -    <ant:mkdir dir="${maven.javacc.compile.src}/geronimo/persistence/ejb/ejbql"/>
  -    <ant:jjtree target="src/java/geronimo/persistence/ejb/ejbql/EJBQL20Parser.jjt"
  -                outputdirectory="${maven.javacc.compile.src}/geronimo/persistence/ejb/ejbql"
  -                javacchome="${maven.repo.local}/javacc/jars" />
  -    <ant:javacc target="${maven.javacc.compile.src}/geronimo/persistence/ejb/ejbql/EJBQL20Parser.jj"
  -                javacchome="${maven.repo.local}/javacc/jars"/>
  -    -->
  -  </preGoal>
  -
  -
     <!-- Set up the test files -->
     <postGoal name="test:test-resources">
  -
  -    <!-- Compile the code for the Marshalling/Remoting tests -->
  -    <ant:mkdir dir="${maven.build.dir}/mock-app"/>
  -    <javac
  -      destdir="${maven.build.dir}/mock-app"
  -      debug="${maven.compile.debug}"
  -      deprecation="${maven.compile.deprecation}"
  -      optimize="${maven.compile.optimize}">
  -      <src>
  -        <path>
  -          <pathelement location="${maven.src.dir}/test-data/mock-app"/>
  -        </path>
  -      </src>
  -    </javac>
  -
  -  </postGoal>  
  +    
  +    <j:jelly xmlns="jelly:ant">
  +      <!-- Compile the code for the Marshalling/Remoting tests -->
  +      <mkdir dir="${maven.build.dir}/mock-app"/>
  +      <javac
  +        destdir="${maven.build.dir}/mock-app"
  +        debug="${maven.compile.debug}"
  +        deprecation="${maven.compile.deprecation}"
  +        optimize="${maven.compile.optimize}">
  +        <src>
  +          <path>
  +            <pathelement location="${maven.src.dir}/test-data/mock-app"/>
  +          </path>
  +        </src>
  +      </javac>
  +    </j:jelly>
  +    
  +  </postGoal>
   
   </project>
  
  
  
  1.18      +75 -4     incubator-geronimo/modules/core/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- project.xml	30 Aug 2003 08:40:37 -0000	1.17
  +++ project.xml	1 Sep 2003 19:47:39 -0000	1.18
  @@ -25,9 +25,71 @@
     <!-- ============ -->
   
     <dependencies>
  -
  +    
  +    <!-- Plugin Dependencies -->
  +    
  +    <dependency>
  +      <id>commons-collections</id>
  +      <version>2.1</version>
  +      <properties>
  +        <runtime>false</runtime>
  +      </properties>
  +    </dependency>
  +    
  +    <!-- Already a dependent
  +    <dependency>
  +      <id>commons-logging</id>
  +      <version>1.1-dev</version>
  +      <properties>
  +        <runtime>false</runtime>
  +      </properties>
  +    </dependency>
  +    -->
  +    
  +    <!-- Already a dependent
  +    <dependency>
  +      <id>log4j</id>
  +      <version>1.2.8</version>
  +      <properties>
  +        <runtime>false</runtime>
  +      </properties>
  +    </dependency>
  +    -->
  +    
  +    <dependency>
  +      <id>xdoclet</id>
  +      <version>1.2b2</version>
  +      <properties>
  +        <runtime>false</runtime>
  +      </properties>
  +    </dependency>
  +    
  +    <dependency>
  +      <id>xdoclet+xdoclet-module</id>
  +      <version>1.2b2</version>
  +      <properties>
  +        <runtime>false</runtime>
  +      </properties>
  +    </dependency>
  +    
  +    <dependency>
  +      <id>xdoclet+jmx-module</id>
  +      <version>1.2b2</version>
  +      <properties>
  +        <runtime>false</runtime>
  +      </properties>
  +    </dependency>
  +    
  +    <dependency>
  +      <id>xdoclet+xjavadoc</id>
  +      <version>1.2b2</version>
  +      <properties>
  +        <runtime>false</runtime>
  +      </properties>
  +    </dependency>
  +    
       <!-- Module Dependencies -->
  -
  +    
       <dependency>
         <groupId>geronimo</groupId>
         <artifactId>geronimo-common</artifactId>
  @@ -36,7 +98,16 @@
           <module>true</module>
         </properties>
       </dependency>
  -
  +    
  +    <dependency>
  +      <groupId>geronimo</groupId>
  +      <artifactId>geronimo-kernel</artifactId>
  +      <version>DEV</version>
  +      <properties>
  +        <module>true</module>
  +      </properties>
  +    </dependency>
  +    
       <dependency>
         <groupId>geronimo</groupId>
         <artifactId>geronimo-twiddle</artifactId>
  
  
  

Mime
View raw message