You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/11 11:13:07 UTC
svn commit: r312843 - in /cocoon/trunk: build.properties
src/java/org/apache/cocoon/components/thread/ThreadPool.java status.xml
tools/targets/init-build.xml tools/targets/webapp-build.xml
Author: cziegeler
Date: Tue Oct 11 02:12:58 2005
New Revision: 312843
URL: http://svn.apache.org/viewcvs?rev=312843&view=rev
Log:
Fix typo and do not copy javadocs and documentation to webapp anymore
Modified:
cocoon/trunk/build.properties
cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java
cocoon/trunk/status.xml
cocoon/trunk/tools/targets/init-build.xml
cocoon/trunk/tools/targets/webapp-build.xml
Modified: cocoon/trunk/build.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/build.properties?rev=312843&r1=312842&r2=312843&view=diff
==============================================================================
--- cocoon/trunk/build.properties (original)
+++ cocoon/trunk/build.properties Tue Oct 11 02:12:58 2005
@@ -23,9 +23,6 @@
# ---- Webapp ------------------------------------------------------------------
-# (RP) commented out webapp documentation as it is broken
-exclude.webapp.documentation=true
-#exclude.webapp.javadocs=true
#exclude.webapp.samples=true
#exclude.webapp.test-suite=true
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java?rev=312843&r1=312842&r2=312843&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/thread/ThreadPool.java Tue Oct 11 02:12:58 2005
@@ -1,5 +1,5 @@
/*
- * 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.
@@ -125,7 +125,7 @@
* @return Whether a shutDown method has succeeded in terminating all
* threads
*/
- boolean isTerminatedAfterShutdown());
+ boolean isTerminatedAfterShutdown();
/**
* Execute a command using this pool
Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=312843&r1=312842&r2=312843&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Tue Oct 11 02:12:58 2005
@@ -583,6 +583,9 @@
</action>
</release>
<release version="2.1.8" date="TBD">
+ <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/trunk/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?rev=312843&r1=312842&r2=312843&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Tue Oct 11 02:12:58 2005
@@ -59,15 +59,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/trunk/tools/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/webapp-build.xml?rev=312843&r1=312842&r2=312843&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/webapp-build.xml (original)
+++ cocoon/trunk/tools/targets/webapp-build.xml Tue Oct 11 02:12:58 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.
@@ -120,59 +120,7 @@
-->
</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="cocoon-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 -->
- <!-- (RP) commented out as trunk doesn't support a dynamic documentation
- <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 -->
- <!-- (RP) commented out as trunk doesn't support a dynamic documentation
- <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">