balld       01/07/16 11:09:45

  Modified:    .        build.xml
  Added:       webapp.site cocoon.xconf sitemap.xmap
               webapp.site/WEB-INF web.xml
  Log:
  added build target for 'sitewebapp', added conf files specific to that webapp
  
  Revision  Changes    Path
  1.27      +81 -1     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml 2001/07/16 15:23:22     1.26
  +++ build.xml 2001/07/16 18:09:44     1.27
  @@ -146,6 +146,7 @@
       <property name="skins.dir"    value="./skins"/>
       <property name="images.dir"   value="./xdocs/images"/>
       <property name="webapp.dir"   value="./webapp"/>
  +    <property name="webapp.site.dir"   value="./webapp.site"/>
       <property name="resource.dir" value="./resources"/>
       <property name="packages"     value="org.apache.*"/>
   
  @@ -163,6 +164,7 @@
       <property name="build.xdocs"    value="${build.dir}/xdocs"/>
       <property name="build.docs.printer" value="${build.dir}/printer-docs"/>
       <property name="build.war"      value="${build.dir}/webapp"/>
  +    <property name="build.site.war"      value="${build.dir}/${name}-site"/>
       <property name="build.javadocs" value="${build.dir}/javadocs"/>
   
       <property name="dist.root"   value="./dist"/>
  @@ -429,13 +431,63 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Prepares the webapp directories                                       -->
  +  <!-- Prepares the webapp directories                                     -->
     <!-- =================================================================== -->
     <target name="prepare-webapp" depends="copy-webapp, prepare-webapp-php, 
prepare-webapp-xt">
         <!-- Simply do nothing, just invoke all dependencies -->
     </target>
   
     <!-- =================================================================== -->
  +  <!-- Copies the site webapp directories                                  -->
  +  <!-- =================================================================== -->
  +  <target name="copy-sitewebapp" depends="prepare">
  +    <mkdir dir="${build.site.war}"/>
  +    
  +    <copy todir="${build.site.war}" filtering="on">
  +      <fileset dir="${webapp.site.dir}">
  +        <include name="sitemap.xmap"/>
  +        <include name="cocoon.xconf"/>
  +        <include name="WEB-INF/web.xml"/>
  +      </fileset>
  +    </copy>
  +
  +    <copy todir="${build.site.war}/style" filtering="on">
  +      <fileset dir="${webapp.dir}/stylesheets/documents"/>
  +    </copy>
  +
  +    <copy todir="${build.site.war}/content/xdocs" filtering="off">
  +      <fileset dir="${docs.dir}">
  +        <include name="*.xml"/>
  +        <include name="**/*.dtd"/>
  +        <include name="**/*.ent"/>
  +        <exclude name="*-book.xml"/>
  +      </fileset>
  +    </copy>
  +
  +    <copy todir="${build.site.war}/resources/images" filtering="off">
  +      <fileset dir="${images.dir}">
  +        <include name="*.gif"/>
  +        <include name="*.jpg"/>
  +        <include name="*.png"/>
  +      </fileset>
  +    </copy>
  +
  +    <copy todir="${build.site.war}/content" filtering="off">
  +      <fileset dir="${docs.dir}">
  +        <include name="site-book.xml"/>
  +      </fileset>
  +    </copy>
  +
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Prepares the site webapp directories                                       
-->
  +  <!-- =================================================================== -->
  +  <target name="prepare-sitewebapp" depends="copy-sitewebapp">
  +      <!-- Simply do nothing, just invoke all dependencies -->
  +  </target>
  +
  +  <!-- =================================================================== -->
     <!-- Prepares the libraries for the war package                          -->
     <!-- =================================================================== -->
     <target name="prepare-xsp" depends="package" if="compile.xsp">
  @@ -470,10 +522,38 @@
     </target>
   
     <!-- =================================================================== -->
  +  <!-- Prepares the libraries for the sitemap war package                          
-->
  +  <!-- =================================================================== -->
  +  <target name="prepare-sitewebapp-libs" depends="package">
  +    <copy todir="${build.site.war}/WEB-INF/lib">
  +      <fileset dir="${lib.dir}">
  +        <include name="Tidy.jar"/>
  +        <include name="avalon*.jar"/>
  +        <include name="batik*.jar"/>
  +        <include name="dom2.jar"/>
  +        <include name="jakarta*.jar"/>
  +        <include name="jstyle.jar"/>
  +        <include name="logkit*.jar"/>
  +        <include name="maybeupload*.jar"/>
  +        <include name="xalan*.jar"/>
  +        <include name="xerces*.jar"/>
  +      </fileset>
  +    </copy>
  +    <copy file="${build.dir}/${name}.jar" 
tofile="${build.site.war}/WEB-INF/lib/${name}-${version}.jar"/>
  +  </target>
  +
  +  <!-- =================================================================== -->
     <!-- Creates the war file                                                -->
     <!-- =================================================================== -->
     <target name="webapp" depends="prepare-webapp, prepare-webapp-libs, prepare-xsp" 
description="Generates the war package">
       <jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**"/>
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Creates the war file                                                -->
  +  <!-- =================================================================== -->
  +  <target name="sitewebapp" depends="prepare-sitewebapp, prepare-sitewebapp-libs" 
description="Generates the war package">
  +    <jar jarfile="${build.dir}/${name}-site.war" basedir="${build.site.war}" 
includes="**"/>
     </target>
   
     <!-- =================================================================== -->
  
  
  
  1.1                  xml-cocoon2/webapp.site/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  <?xml version="1.0"?>
  <cocoon version="2.0">
  
    <store class="org.apache.cocoon.components.store.MRUMemoryStore">
       <parameter name="freememory" value="1000000"/>
       <parameter name="heapsize" value="60000000"/>
       <parameter name="objectlifetime" value="300"/>
       <parameter name="interval" value="10"/>
       <parameter name="maxobjects" value="100"/>
       <parameter name="usethread" value="false"/>
       <parameter name="threadpriority" value="5"/>
    </store>
  
    <url-factory>
      <protocol name="resource" 
class="org.apache.cocoon.components.url.ResourceURLFactory"/>
      <protocol name="context"  
class="org.apache.cocoon.components.url.ContextURLFactory"/>
    </url-factory>
  
    <program-generator>
      <parameter name="auto-reload" value="true"/>
      <parameter name="root-package" value="org.apache.cocoon.www"/>
      <parameter name="preload" value="true"/>
    </program-generator>
  
    <programming-languages>
      <java-language name="java">
        <parameter name="compiler" 
value="org.apache.cocoon.components.language.programming.java.Javac"/>
        <parameter name="class-loader" 
value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
      </java-language>
    </programming-languages>
  
    <classloader 
class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
  
    <markup-languages>
      <sitemap-language name="sitemap">
        <parameter name="prefix" value="map"/>
        <parameter name="uri" value="http://apache.org/cocoon/sitemap/1.0"/>
        <target-language name="java">
          <parameter name="core-logicsheet" 
value="resource://org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl"/>
        </target-language>
      </sitemap-language>
    </markup-languages>
  
    <stream-pipeline 
class="org.apache.cocoon.components.pipeline.CachingStreamPipeline"/>
  
    <stream-cache class="org.apache.cocoon.components.store.MRUMemoryStore">
       <parameter name="freememory" value="1000000"/>
       <parameter name="heapsize" value="60000000"/>
       <parameter name="objectlifetime" value="300"/>
       <parameter name="interval" value="10"/>
       <parameter name="maxobjects" value="100"/>
       <parameter name="usethread" value="false"/>
       <parameter name="threadpriority" value="5"/>
    </stream-cache>
  
    <event-pipeline 
class="org.apache.cocoon.components.pipeline.CachingEventPipeline"/>
  
    <event-cache class="org.apache.cocoon.components.store.MRUMemoryStore">
       <parameter name="freememory" value="1000000"/>
       <parameter name="heapsize" value="60000000"/>
       <parameter name="objectlifetime" value="300"/>
       <parameter name="interval" value="10"/>
       <parameter name="maxobjects" value="100"/>
       <parameter name="usethread" value="false"/>
       <parameter name="threadpriority" value="5"/>
    </event-cache>
  
    <sitemap file="sitemap.xmap" reload-method="asynchron" check-reload="yes"/>
  
  </cocoon>
  
  
  
  1.1                  xml-cocoon2/webapp.site/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  <?xml version="1.0"?>
  
  <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
  
  <!-- =========================== Pipelines ================================= -->
  <map:pipelines>
  <map:pipeline>
  
  <map:match pattern="">
    <map:redirect-to uri="index"/>
  </map:match>
  
  <map:match pattern="*">
    <map:aggregate element="root">
      <map:part src="cocoon:/shared/sidebar"/>
      <map:part src="cocoon:/document/{1}"/>
    </map:aggregate>
    <map:transform src="style/root2html.xsl">
      <map:parameter name="path" value="{1}"/>
    </map:transform>
    <map:serialize/>
  </map:match>
  
  <map:match pattern="shared/sidebar">
    <map:generate src="content/site-book.xml"/>
    <map:transform src="style/book2sidebar.xsl"/>
    <map:serialize/>
  </map:match>
  
  <map:match pattern="document/*">
    <map:generate src="content/xdocs/{1}.xml"/>
    <map:serialize/>
  </map:match>
  
  <map:match pattern="images/*.gif">
    <map:read src="resources/images/{1}.gif" mime-type="image/gif"/>
  </map:match>
  
  <map:match pattern="images/*.jpg">
    <map:read src="resources/images/{1}.jpg" mime-type="image/jpeg"/>
  </map:match>
  
  <map:match pattern="images/*.png">
    <map:read src="resources/images/{1}.png" mime-type="image/png"/>
  </map:match>
  
  <map:handle-errors>
    <map:transform src="style/system/error2html.xsl"/>
    <map:serialize status-code="500"/>
  </map:handle-errors>
  
  </map:pipeline>
  </map:pipelines>
  <!-- =========================== Components ================================ -->
  
   <map:components>
  
    <map:generators default="file">
     <map:generator  name="file"        
src="org.apache.cocoon.generation.FileGenerator" label="content"/>
    </map:generators>
  
    <map:transformers default="xslt">
     <map:transformer     name="xslt"      
src="org.apache.cocoon.transformation.TraxTransformer">
      <use-store>true</use-store>
      <use-request-parameters>false</use-request-parameters>
      <use-browser-capabilities-db>false</use-browser-capabilities-db>
     </map:transformer>
    </map:transformers>
  
    <map:readers default="resource">
     <map:reader name="resource"       src="org.apache.cocoon.reading.ResourceReader"/>
    </map:readers>
  
    <map:serializers default="html">
     <map:serializer name="xml"    mime-type="text/xml"         
src="org.apache.cocoon.serialization.XMLSerializer"/>
     <map:serializer name="html"   mime-type="text/html"        
src="org.apache.cocoon.serialization.HTMLSerializer"/>
     <map:serializer name="svgxml" mime-type="image/svg-xml"    
src="org.apache.cocoon.serialization.XMLSerializer">
      <doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
      <doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
     </map:serializer>
     <map:serializer name="svg2jpeg" mime-type="image/jpeg"     
src="org.apache.cocoon.serialization.SVGSerializer">
     </map:serializer>
     <map:serializer name="svg2png" mime-type="image/png"       
src="org.apache.cocoon.serialization.SVGSerializer">
     </map:serializer>
    </map:serializers>
  
    <map:matchers default="wildcard">
     <map:matcher name="wildcard" 
src="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
     <map:matcher name="regexp" 
src="org.apache.cocoon.matching.RegexpURIMatcherFactory"/>
    </map:matchers>
  
   </map:components>
  
  <!-- =========================== Views =================================== -->
  
  <!-- =========================== Resources ================================= -->
  
  <!-- ========================== Action sets ================================ -->
  
  </map:sitemap>
  
  <!-- end of file -->
  
  
  
  1.1                  xml-cocoon2/webapp.site/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <!DOCTYPE web-app
      PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
      "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
  
  <web-app>
    <display-name>Cocoon2 site</display-name>
    <description>Documentation for cocoon2</description>
    <servlet>
      <servlet-name>Cocoon2</servlet-name>
      <display-name>Cocoon2</display-name>
      <description>The main Cocoon2 servlet</description>
      <servlet-class>org.apache.cocoon.servlet.CocoonServlet</servlet-class>
      <init-param>
        <param-name>configurations</param-name>
        <param-value>/cocoon.xconf</param-value>
      </init-param>
      <init-param>
        <param-name>log-level</param-name>
        <param-value>WARN</param-value>
      </init-param>
      <init-param>
        <param-name>allow-reload</param-name>
        <param-value>false</param-value>
      </init-param>
      <load-on-startup>1</load-on-startup>
    </servlet>
    <servlet-mapping>
      <servlet-name>Cocoon2</servlet-name>
      <url-pattern>/</url-pattern>
    </servlet-mapping>
  </web-app>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to