turbine-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ep...@apache.org
Subject cvs commit: jakarta-turbine-fulcrum maven.xml project.properties project.xml
Date Fri, 14 Nov 2003 13:31:08 GMT
epugh       2003/11/14 05:31:08

  Modified:    .        maven.xml project.properties project.xml
  Log:
  Update to use reactor directly.  The multiproject is failing due to memory issues.
  
  Revision  Changes    Path
  1.17      +19 -0     jakarta-turbine-fulcrum/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/maven.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- maven.xml	28 Sep 2003 12:37:14 -0000	1.16
  +++ maven.xml	14 Nov 2003 13:31:08 -0000	1.17
  @@ -5,4 +5,23 @@
     xmlns:deploy="deploy"
     >
   
  +
  +<goal name="fulcrum:build" description="Build Fulcrum.">
  +    <maven:reactor basedir="${basedir}"
  +      includes="**/project.xml"
  +      excludes="target/**,project.xml,**/new1/**,**/proposals/**"
  +      goals="jar:install"
  +      banner="Installing:"
  +      ignoreFailures="false" />
  +  </goal>
  +
  +  <goal name="fulcrum:clean" description="Build Fulcrum." prereqs="clean">
  +    <maven:reactor basedir="${basedir}"
  +      includes="**/project.xml"
  +      excludes="target/**,project.xml"
  +      goals="clean:clean"
  +      banner="Installing:"
  +      ignoreFailures="false" />
  +  </goal>
  +
   </project>
  
  
  
  1.17      +3 -3      jakarta-turbine-fulcrum/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/project.properties,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- project.properties	28 Sep 2003 12:37:54 -0000	1.16
  +++ project.properties	14 Nov 2003 13:31:08 -0000	1.17
  @@ -4,7 +4,7 @@
   # contain all the jars needed to build Fulcrum, even if a jar
   # is missing on ibiblio
   #========================================================================
  -#maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
  +maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
   
   maven.checkstyle.format = turbine
   maven.checkstyle.properties = ${basedir}/project.properties
  @@ -29,5 +29,5 @@
   maven.multiproject.navigation=aggregate
   maven.multiproject.aggregateDir=
   maven.multiproject.type=jar
  -maven.multiproject.includes=*/project.xml,osworkflow/*/project.xml
  -#maven.multiproject.excludes=scheduler/*.*,cache/*.*,security/*.*
  \ No newline at end of file
  +maven.multiproject.includes=*/project.xml,osworkflow/*/project.xml,*/impl/project.xml,*/api/project.xml
  +maven.multiproject.excludes=scheduler/*.*,cache/*.*,security/*.*,mimetype/**/*.*,osworkflow/**/*.*/xmlrpc/**/*.*,crypto/**/*.*
  \ No newline at end of file
  
  
  
  1.78      +36 -9     jakarta-turbine-fulcrum/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/project.xml,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- project.xml	10 Nov 2003 03:47:29 -0000	1.77
  +++ project.xml	14 Nov 2003 13:31:08 -0000	1.78
  @@ -45,12 +45,6 @@
     </mailingLists>
     <developers>
       <developer>
  -      <name>Scott Eade</name>
  -      <id>seade</id>
  -      <email>seade@backstagetech.com.au</email>
  -      <organization>Backstage Technologies Pty. Ltd.</organization>
  -    </developer>
  -    <developer>
         <name>Geir Magnusson Jr.</name>
         <id>geirm</id>
         <email>geirm@optonline.net</email>
  @@ -258,11 +252,44 @@
       <sourceDirectory>${basedir}/src/java/</sourceDirectory>
       <unitTestSourceDirectory>${basedir}/src/test/</unitTestSourceDirectory>
       <unitTest>
  -          <includes>
  -            <include>**/*Test.java</include>
  +      <includes>
  +        <include>**/*Test.*</include>
  +        <include>**/*TestCase.*</include>
         </includes>
  +      <excludes>
  +        <include>**/Abstract*.*</include>
  +      </excludes>
  +      <resources>
  +        <resource>
  +          <directory>${basedir}/src/java</directory>
  +          <includes>
  +            <include>**/*.x*</include>
  +          </includes>
  +        </resource>
  +        <resource>
  +          <directory>${basedir}/conf</directory>
  +          <targetPath>BLOCK-INF</targetPath>
  +          <includes>
  +            <include>block.xml</include>
  +          </includes>
  +        </resource>
  +      </resources>      
       </unitTest>
  - 
  +    <resources>
  +       <resource>
  +         <directory>${basedir}/conf</directory>
  +         <targetPath>BLOCK-INF</targetPath>
  +         <includes>
  +           <include>block.xml</include>
  +         </includes>
  +       </resource>
  +       <resource>
  +         <directory>${basedir}/src/java</directory>
  +         <includes>
  +           <include>**/*.x*</include>
  +         </includes>
  +       </resource>
  +    </resources>
     </build>
    
     <reports>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org


Mime
View raw message