stefano 00/08/21 10:33:07
Modified: . Tag: xml-cocoon2 todo.xml build.xml
Log:
added latest changes
Revision Changes Path
No revision
No revision
1.6.2.11 +7 -15 xml-cocoon/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/todo.xml,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -u -r1.6.2.10 -r1.6.2.11
--- todo.xml 2000/08/17 16:44:53 1.6.2.10
+++ todo.xml 2000/08/21 17:33:04 1.6.2.11
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: todo.xml,v 1.6.2.10 2000/08/17 16:44:53 stefano Exp $
+ $Id: todo.xml,v 1.6.2.11 2000/08/21 17:33:04 stefano Exp $
-->
@@ -39,12 +39,6 @@
</action>
<action context="code">
- Extend the cocoon demo war file to create a complete presentation of
current
- publishing capabilities (need FO, SVG, SMIL, RSS, VRML... we can just port
- them from Cocoon1 and adapt them for the new processing)
- </action>
-
- <action context="code">
Check and fix xsl:import which doesn't seem to work expected... very
strange..
it might be an XSLT problem with the XSP example since it uses namespaces
heavily... should we use the namespace() axis?
@@ -55,23 +49,21 @@
for SAX2 final.
</action>
+ <action context="code">
+ Finish writing SVGSerializer.
+ </action>
</actions>
<actions priority="medium">
- <action context="code" assigned-to="RB">
- Create a SVGSerializer
- </action>
-
<action context="code">
Create a better logging subsystem.
</action>
<action context="code">
- Create a Cocoon1-like status page to indicate current status. Should be
- implemented as a Generator directly. It should also be able to generate
- SVG graphs of current load and so forth. Now that we have the technology,
- let's use it!.
+ Implement a internal profiling tool that should indicate the load and
history of
+ such along with the status page. Something both useful and fancy to show
the
+ power of C2.
</action>
</actions>
1.6.2.20 +32 -43 xml-cocoon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/build.xml,v
retrieving revision 1.6.2.19
retrieving revision 1.6.2.20
diff -u -r1.6.2.19 -r1.6.2.20
--- build.xml 2000/08/17 16:44:25 1.6.2.19
+++ build.xml 2000/08/21 17:33:05 1.6.2.20
@@ -91,15 +91,16 @@
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
- <property name="src.dir" value="./src"/>
- <property name="lib.dir" value="./lib"/>
- <property name="conf.dir" value="./conf"/>
- <property name="docs.dir" value="./xdocs"/>
- <property name="dtd.dir" value="./xdocs/dtd"/>
- <property name="skins.dir" value="./skins"/>
- <property name="images.dir" value="./xdocs/images"/>
- <property name="samples.dir" value="./samples"/>
- <property name="packages" value="org.apache.*"/>
+ <property name="src.dir" value="./src"/>
+ <property name="lib.dir" value="./lib"/>
+ <property name="conf.dir" value="./conf"/>
+ <property name="docs.dir" value="./xdocs"/>
+ <property name="dtd.dir" value="./xdocs/dtd"/>
+ <property name="skins.dir" value="./skins"/>
+ <property name="images.dir" value="./xdocs/images"/>
+ <property name="webapp.dir" value="./webapp"/>
+ <property name="resource.dir" value="./resources"/>
+ <property name="packages" value="org.apache.*"/>
<property name="browser.skin" value="${skins.dir}/xml.apache.org/"/>
<property name="printer.skin" value="${skins.dir}/printer/"/>
@@ -127,24 +128,13 @@
<filter token="log" value="true"/>
<filter token="verbose" value="true"/>
- <available property="php.present"
- classname="net.php.servlet" />
-
- <available property="servlet.present"
- classname="javax.servlet.http.HttpServlet" />
-
- <available property="svg.present"
- classname="org.csiro.svgv.display.SvgToAwtConverter" />
-
- <available property="rhino.present"
- classname="org.mozilla.javascript.tools.jsc.Main" />
-
- <available property="jstyle.present"
- classname="jstyle.JSFormatter" />
-
- <available property="fop.present"
- classname="org.apache.fop.apps.Driver" />
-
+ <available property="php.present" classname="net.php.servlet"/>
+ <available property="servlet.present"
classname="javax.servlet.http.HttpServlet"/>
+ <available property="svg.present"
classname="org.csiro.svg.tools.SvgToImageConverter"/>
+ <available property="rhino.present"
classname="org.mozilla.javascript.tools.jsc.Main"/>
+ <available property="jstyle.present" classname="jstyle.JSFormatter"/>
+ <available property="fop.present"
classname="org.apache.fop.apps.Driver"/>
+
</target>
<!-- ===================================================================
-->
@@ -197,8 +187,8 @@
<!-- ===================================================================
-->
<target name="compile" depends="prepare-src">
<copydir src="${build.src}" dest="${build.dest}">
- <include name="**/Manifest.mf" />
- <include name="**/*.xsl" />
+ <include name="**/Manifest.mf"/>
+ <include name="**/*.xsl"/>
</copydir>
<javac srcdir="${build.src}"
@@ -206,13 +196,13 @@
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}">
- <exclude name="**/*.html" />
- <exclude name="**/CocoonServlet*.java" unless="servlet.present" />
- <exclude name="**/SVGSerializer.java" unless="svg.present" />
- <exclude name="**/Javascript*" unless="rhino.present" />
- <exclude name="**/Jstyle*" unless="jstyle.present" />
- <exclude name="**/FO2*" unless="fop.present" />
- <exclude name="**/Php*" unless="php.present" />
+ <exclude name="**/*.html"/>
+ <exclude name="**/CocoonServlet*.java" unless="servlet.present"/>
+ <exclude name="**/SVGSerializer.java" unless="svg.present"/>
+ <exclude name="**/Javascript*" unless="rhino.present"/>
+ <exclude name="**/Jstyle*" unless="jstyle.present"/>
+ <exclude name="**/FO2*" unless="fop.present"/>
+ <exclude name="**/Php*" unless="php.present"/>
</javac>
</target>
@@ -234,12 +224,12 @@
<copydir src="${conf.dir}" dest="${build.war}" filtering="on"/>
- <copydir src="${samples.dir}" dest="${build.war}" filtering="on">
+ <copydir src="${webapp.dir}" dest="${build.war}" filtering="on">
<exclude name="**/images/*"/>
<exclude name="README"/>
</copydir>
- <copydir src="${samples.dir}" dest="${build.war}" filtering="off">
+ <copydir src="${webapp.dir}" dest="${build.war}" filtering="off">
<include name="**/images/*"/>
</copydir>
@@ -310,7 +300,7 @@
windowtitle="${Name} API"
doctitle="${Name}"
bottom="Copyright © ${year} Apache Software Foundation.
All Rights Reserved."
- stylesheetfile="${skins.dir}/javadoc.css"
+ stylesheetfile="${resource.dir}/javadoc.css"
/>
</target>
@@ -325,19 +315,17 @@
<mkdir dir="${dist.dir}/conf"/>
<mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/api"/>
- <mkdir dir="${dist.dir}/samples"/>
<mkdir dir="${dist.dir}/skins"/>
- <mkdir dir="${dist.dir}/webapps"/>
+ <mkdir dir="${dist.dir}/webapp"/>
<mkdir dir="${dist.dir}/xdocs"/>
<copyfile src="${build.dir}/${name}.jar"
dest="${dist.dir}/bin/${name}.jar"/>
- <copyfile src="${build.war}/${name}.war"
dest="${dist.dir}/webapps/${name}.war"/>
+ <copyfile src="${build.war}/${name}.war"
dest="${dist.dir}/webapp/${name}.war"/>
<copydir src="${build.src}" dest="${dist.dir}/src"/>
<copydir src="${conf.dir}" dest="${dist.dir}/conf"/>
<copydir src="${build.docs}" dest="${dist.dir}/docs"/>
<copydir src="${build.javadocs}" dest="${dist.dir}/docs/api"/>
- <copydir src="${samples.dir}" dest="${dist.dir}/samples"/>
<copydir src="${docs.dir}" dest="${dist.dir}/xdocs"
excludes="book.xml, changes.xml, todo.xml"/>
<copydir src="${docs.dir}" dest="${dist.dir}"
includes="changes.xml, todo.xml"/>
<copydir src="${skins.dir}" dest="${dist.dir}/skins"/>
@@ -348,6 +336,7 @@
<chmod perm="+x" file="${dist.dir}/build.sh"/>
<fixcrlf srcdir="${dist.dir}" includes="build.sh" cr="remove"/>
<fixcrlf srcdir="${dist.dir}" includes="build.bat" cr="add"/>
+ <fixcrlf srcdir="${dist.dir}" includes="lcp.bat" cr="add"/>
</target>
<!-- ===================================================================
-->
