cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2 build.xml properties.xml
Date Fri, 27 Sep 2002 11:46:12 GMT
cziegeler    2002/09/27 04:46:12

  Modified:    .        build.xml properties.xml
  Log:
  Webapp target is now configurable via properties.xml
  
  Revision  Changes    Path
  1.269     +30 -3     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.268
  retrieving revision 1.269
  diff -u -r1.268 -r1.269
  --- build.xml	26 Sep 2002 14:10:33 -0000	1.268
  +++ build.xml	27 Sep 2002 11:46:12 -0000	1.269
  @@ -1409,11 +1409,38 @@
       <manifest-tool directory="${build.war}/WEB-INF/lib"
                      manifest="${build.war}/WEB-INF/Manifest.mf"/>
   
  +    <!-- Compatible testing of 'obsolete' exclude.webapp.samples and
  +         new property cocoon.webapp.samples.include -->
  +    <condition property="exclude.samples.from.webapp" value="true">
  +      <or>
  +        <isfalse value="${cocoon.webapp.samples.include}"/>
  +        <isset   property="exclude.webapp.samples"/>
  +      </or>
  +    </condition>
  +
  +    <!-- Compatible testing of 'obsolete' exclude.webapp.documentation and
  +         new property cocoon.webapp.documentation .include -->
  +    <condition property="exclude.documentation.from.webapp" value="true">
  +      <or>
  +        <isfalse value="${cocoon.webapp.documentation.include}"/>
  +        <isset   property="exclude.webapp.documentation"/>
  +      </or>
  +    </condition>
  +
  +    <!-- Compatible testing of 'obsolete' exclude.webapp.javadocs and
  +         new property cocoon.webapp.javadocs.include -->
  +    <condition property="exclude.javadocs.from.webapp" value="true">
  +      <or>
  +        <isfalse value="${cocoon.webapp.javadocs.include}"/>
  +        <isset   property="exclude.webapp.javadocs"/>
  +      </or>
  +    </condition>
  +
       <jar jarfile="${build.dir}/${name}.war" manifest="${build.war}/WEB-INF/Manifest.mf">
         <fileset dir="${build.war}">
  -        <exclude name="samples/**"       if="exclude.webapp.samples"/>
  -        <exclude name="documentation/**" if="exclude.webapp.documentation"/>
  -        <exclude name="apidocs/**"       if="exclude.webapp.javadocs"/>
  +        <exclude name="samples/**"       if="exclude.samples.from.webapp"/>
  +        <exclude name="documentation/**" if="exclude.documentation.from.webapp"/>
  +        <exclude name="apidocs/**"       if="exclude.javadocs.from.webapp"/>
         </fileset>
       </jar>
       <jar jarfile="${build.dir}/${name}-webapp-samples.jar">
  
  
  
  1.7       +11 -0     xml-cocoon2/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/properties.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- properties.xml	27 Sep 2002 09:05:16 -0000	1.6
  +++ properties.xml	27 Sep 2002 11:46:12 -0000	1.7
  @@ -111,6 +111,17 @@
           <portal-fw include="true"/>
         </blocks>
   
  +      <!-- Specify what should be included in the web application (war) file -->
  +      <webapp> 
  +         <!-- Include all documentation -->
  +         <documentation include="true"/>
  +         <!-- Include the javadoc documentation -->
  +         <javadocs include="true"/>
  +         <!-- Include the scratchpad (=experimental) stuff -->
  +         <scratchpad include="true"/>
  +         <!-- Include all samples -->
  +         <samples include="true"/>
  +      </webapp>
      </cocoon>
   
   </properties>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message