cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r312849 - in /cocoon/branches/BRANCH_2_1_X: build.properties status.xml tools/targets/init-build.xml tools/targets/webapp-build.xml
Date Tue, 11 Oct 2005 09:37:45 GMT
Author: cziegeler
Date: Tue Oct 11 02:37:41 2005
New Revision: 312849

URL: http://svn.apache.org/viewcvs?rev=312849&view=rev
Log:
do not copy javadocs and documentation to webapp anymore

Modified:
    cocoon/branches/BRANCH_2_1_X/build.properties
    cocoon/branches/BRANCH_2_1_X/status.xml
    cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
    cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml

Modified: cocoon/branches/BRANCH_2_1_X/build.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/build.properties?rev=312849&r1=312848&r2=312849&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/build.properties Tue Oct 11 02:37:41 2005
@@ -23,8 +23,6 @@
 
 # ---- Webapp ------------------------------------------------------------------
 
-#exclude.webapp.documentation=true
-#exclude.webapp.javadocs=true
 #exclude.webapp.samples=true
 #exclude.webapp.test-suite=true
 

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=312849&r1=312848&r2=312849&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Oct 11 02:37:41 2005
@@ -197,6 +197,9 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="update">
+      JavaDocs and documentation are no longer copied to the webapp.
+    </action>
     <action dev="BD" type="update" due-to="Sandor Spruit" due-to-email="sandor@cs.uu.nl">
       build.sh: use --noconfig option to avoid problems with local ant settings.
       Does not apply to build.bat, windows ant scripts do not have this option.

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml?rev=312849&r1=312848&r2=312849&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Tue Oct 11 02:37:41 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -63,15 +63,6 @@
 
     <!-- Use internal.exclude.XXX shadow props used in the
       unless target attributes -->
-    <condition property="internal.exclude.webapp.documentation">
-      <istrue value="${exclude.webapp.documentation}"/>
-    </condition>
-    <condition property="internal.exclude.webapp.javadocs">
-      <or>
-        <istrue value="${exclude.javadocs}"/>
-        <istrue value="${exclude.webapp.javadocs}"/>
-      </or>
-    </condition>
     <condition property="internal.exclude.webapp.samples">
       <istrue value="${exclude.webapp.samples}"/>
     </condition>

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml?rev=312849&r1=312848&r2=312849&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml Tue Oct 11 02:37:41 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -121,55 +121,7 @@
             addComments="true"/>
   </target>
 
-  <target name="prepare-webapp-javadocs" depends="javadocs" unless="internal.exclude.webapp.javadocs">
-    <mkdir dir="${build.webapp.javadocs}"/>
-
-    <copy todir="${build.webapp.javadocs}" filtering="off">
-      <fileset dir="${build.javadocs}"/>
-    </copy>
-
-    <!-- patch the welcome page to tell we have javadocs to show -->
-    <xpatch file="${build.webapp}/welcome.xml"
-            srcdir="${resources.javadoc}"
-            includes="**/*.xwelcome"/>
-  </target>
-
-  <target name="prepare-webapp-docs" depends="validate-xdocs,validate-jars" unless="internal.exclude.webapp.documentation">
-    <mkdir dir="${build.webapp.docs}"/>
-
-    <copy todir="${build.webapp.docs}" filtering="on">
-      <fileset dir="${documentation}">
-        <exclude name="images/**"/>
-      	<exclude name="*.xwelcome"/>
-      </fileset>
-    </copy>
-
-    <!-- Add some other documents -->
-    <copy file="status.xml"
-      tofile="${build.webapp.docs}/xdocs/status.xml" filtering="on"/>
-    <!-- Copy the docs about all jar files (this requires a dependency to validate-jars)
-->
-    <copy file="${build.temp}/jars.xml"
-      tofile="${build.webapp.docs}/xdocs/installing/jars.xml"
-      filtering="off" failonerror="false" overwrite="true"/>
-
-    <!-- Forrest needs its own file at src/documentation/sitemap.xmap, so we
-    overwrite it with the old Cocoon-specific sitemap here -->
-    <copy file="${documentation}/sitemap-localdocs.xmap"
-      tofile="${build.webapp.docs}/sitemap.xmap" overwrite="true"/>
-
-    <copy todir="${build.webapp.docs}" filtering="off">
-      <fileset dir="${documentation}">
-        <include name="images/**"/>
-      </fileset>
-    </copy>
-
-    <!-- patch the welcome page to tell we have documentation to show -->
-    <xpatch file="${build.webapp}/welcome.xml"
-            srcdir="${documentation}"
-            includes="**/*.xwelcome"/>
-  </target>
-
-  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-test-suite,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf"
description="Builds web application folder">
+  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-test-suite,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf"
description="Builds web application folder">
   </target>
 
   <target name="war" depends="webapp" description="Builds web application archive">



Mime
View raw message