You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/07/04 21:11:37 UTC
cvs commit: jakarta-slide/src/doc examples.xml project.xml
remm 00/07/04 12:11:32
Modified: . build.xml
src/doc examples.xml project.xml
Log:
- Basic layout of the documentation should be done.
- Fixed a build problem. The needed Avalon JARs should automatically be added to the classpath is Avalon is correctly set up in the ../dist/avalon directory. There is a property, called avalon.dist which can be updated to use an alternate directory.
Revision Changes Path
1.24 +7 -7 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 2000/07/04 07:13:28 1.23
+++ build.xml 2000/07/04 19:11:21 1.24
@@ -99,6 +99,7 @@
<target name="main" depends="prepare">
<javac srcdir="src/share" destdir="${slide.build}/classes"
debug="on" deprecation="on"
+ classpath="${avalon.dist}/bin/blocks/Avalon.jar:${avalon.dist}/lib/AvalonAware.jar"
excludes="**/CVS/**,**/package.html,**/apache/tomcat/**,
**/common/Slide.java,**/common/SlideBlock.java" />
</target>
@@ -122,6 +123,7 @@
<target name="no-debug" depends="prepare">
<javac srcdir="src/share" destdir="${slide.build}/classes"
debug="off" deprecation="off"
+ classpath="${avalon.dist}/bin/blocks/Avalon.jar:${avalon.dist}/lib/AvalonAware.jar"
excludes="**/CVS/**,**/package.html,**/apache/tomcat/**,
**/common/Slide.java,**/common/SlideBlock.java" />
</target>
@@ -249,13 +251,13 @@
<!-- =================================================================== -->
- <!-- Build a standalone Slide server -->
+ <!-- Build the Slide JavaDoc -->
<!-- =================================================================== -->
<target name="javadoc" depends="prepare">
<property name="copyright" value="" />
<javadoc sourcepath="src/share" destdir="${slide.build}/doc/javadoc"
dir="." doctitle="Slide JavaDoc" public="true" noindex="true"
- author="true" packagenames="org.*" />
+ author="true" packagenames="org.*" />
</target>
@@ -337,7 +339,7 @@
destdir="${slide.build}/classes"
debug="off" deprecation="off"
includes="**/org/apache/tomcat/**"
- classpath="${slide.build}/classes;${catalina.build}/classes" />
+ classpath="${slide.build}/classes:${catalina.build}/classes" />
<copyfile src="src/etc/MANIFEST.MF"
dest="${slide.build}/classes/MANIFEST.MF" />
<replace file="${slide.build}/classes/MANIFEST.MF"
@@ -390,16 +392,14 @@
deprecation="off"
excludes="**/CVS/**,**/package.html"
includes="**/slide/**"
- classpath="${slide.build}/classes;${catalina.build}/classes;
- ${avalon.dist}/lib/AvalonInterfaces.jar" />
+ classpath="${slide.build}/classes:${catalina.build}/classes:${avalon.dist}/lib/AvalonAware.jar" />
<javac srcdir="src/clients/avalon/src"
destdir="${catalina.build}/classes"
debug="off"
deprecation="off"
excludes="**/CVS/**,**/package.html"
includes="**/tomcat/**"
- classpath="${slide.build}/classes;${catalina.build}/classes;
- ${avalon.dist}/lib/AvalonInterfaces.jar" />
+ classpath="${slide.build}/classes:${catalina.build}/classes:${avalon.dist}/lib/AvalonAware.jar" />
<mkdir dir="${slide.build}/classes/conf" />
<copyfile src="src/clients/avalon/conf/Slide.conf.xml"
dest="${slide.build}/classes/conf/Slide.conf.xml" />
1.3 +3 -15 jakarta-slide/src/doc/examples.xml
Index: examples.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/examples.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- examples.xml 2000/05/24 18:41:56 1.2
+++ examples.xml 2000/07/04 19:11:27 1.3
@@ -1,14 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<document>
- <meta>
- <title>Examples</title>
- <author email="boisvert@exoffice.com"/>
- <copyright>Copyright (c) 2000 Exolab, Inc.</copyright>
- </meta>
+<document url="./examples.xml">
- <body numbering="true">
- <table-of-contents/>
+ <body>
+ <title>Slide examples</title>
<section title="Running The Examples">
@@ -25,13 +20,6 @@
<section title="XML">
<p>The XML example simply imports an XML document into OpenDAV and tries to do various operations on it, including security checks, and different locking and versioning actions.
- </p>
-
- </section>
-
- <section title="Security">
-
- <p>This example is used as a regression test for security-related functionality.
</p>
</section>
1.6 +10 -10 jakarta-slide/src/doc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 2000/07/04 00:40:17 1.5
+++ project.xml 2000/07/04 19:11:28 1.6
@@ -15,19 +15,19 @@
<menu>
<item name="Index" href="index.xml"/>
- <item name="JavaDoc" href="../../../build/slide/doc/javadoc/index.html"/>
- <item name="The Slide Guide"
- href="http://www.interlog.com/~bcholmes/geek/slide-home.html"/>
- </menu>
- <menu name="Using">
- <item name="Running The Examples" href="examples.xml"/>
+ <item name="Status" href="STATUS.html"/>
</menu>
- <menu name="Misc">
+ <menu name="User's Guide">
+ <item name="First Steps" href="conf-lib.xml"/>
<item name="FAQ" href="faq.xml"/>
- <item name="Configuration, JARs, Building" href="conf-lib.xml"/>
- <item name="Status, Todo" href="STATUS.html"/>
+ <item name="Examples" href="examples.xml"/>
+ <item name="Tomcat Howto" href="usage.xml#Using Tomcat"/>
+ <item name="Avalon Howto" href="usage.xml#Using Avalon"/>
+ <item name="The Slide Guide"
+ href="http://www.interlog.com/~bcholmes/geek/slide-home.html"/>
</menu>
- <menu name="Design">
+ <menu name="Programmer's Corner">
+ <item name="JavaDoc" href="../../../build/slide/doc/javadoc/index.html"/>
<item name="Architecture" href="architecture.xml"/>
<item name="Domain" href="domain.xml"/>
<item name="Namespace" href="namespace.xml"/>