You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2007/04/10 08:05:09 UTC
svn commit: r527041 [5/5] - in /forrest/trunk/whiteboard/forrest2: core/
core/src/conf/ core/src/core/xdocs/samples/xslt/ core/src/docs/
core/src/examples/affiliateProductCatalogue/src/
core/src/examples/affiliateProductCatalogue/src/xdocs/ core/src/ex...
Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/helloWorld.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/helloWorld.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/helloWorld.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/helloWorld.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,12 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>XHTML 2 Hello World</title>
- </head>
- <body>
- <h>Hello World</h>
-
- <a href="bonjourMonde.html">French</a>
+ </head>
+ <body>
+ <h>Hello World</h><a href="bonjourMonde.html">French</a>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/core/src/test/forrestContext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/test/forrestContext.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/test/forrestContext.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/test/forrestContext.xml Mon Apr 9 23:05:03 2007
@@ -16,38 +16,29 @@
limitations under the License.
-->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-
- <!-- ============================================= -->
- <!-- Readers -->
- <!-- ============================================= -->
-
-
- <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
- <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
- <bean id="hello"
+<beans>
+<!-- ============================================= -->
+<!-- Readers -->
+<!-- ============================================= -->
+ <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
+ <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
+ <bean id="hello"
class="org.apache.forrest.core.reader.ChainedReader">
- <property name="docType"
+ <property name="docType"
value="org.apache.forrest.helloWorld"/>
- </bean>
-
- <!-- ============================================= -->
- <!-- Input Plugins -->
- <!-- ============================================= -->
-
- <bean id="org.apache.forrest.hellowWorld"
+ </bean>
+<!-- ============================================= -->
+<!-- Input Plugins -->
+<!-- ============================================= -->
+ <bean id="org.apache.forrest.hellowWorld"
class="org.apache.forrest.test.core.plugins.input.HelloWorldInputPlugin" />
-
- <!-- ============================================= -->
- <!-- Output Plugins -->
- <!-- ============================================= -->
-
- <bean id="html"
+<!-- ============================================= -->
+<!-- Output Plugins -->
+<!-- ============================================= -->
+ <bean id="html"
class="org.apache.forrest.core.plugin.XSLTOutputPlugin">
- <property name="pattern" value="html" />
- <property name="xsltPath"
+ <property name="pattern" value="html" />
+ <property name="xsltPath"
value="/xdocs/samples/xslt/internal-to-html.xsl" />
- </bean>
-
+ </bean>
</beans>
Modified: forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml Mon Apr 9 23:05:03 2007
@@ -19,31 +19,25 @@
<location regexp="xhtml/testPage.*">
<source href="classpath:/xdocs/samples/xhtml2/sample_simple.html"/>
</location>
-
<location regexp="xhtml/helloWorld.html">
<source href="hello:classpath:/xdocs/samples/xml/helloWorld.xml"/>
</location>
-
<location regexp="(.*)/variable/(.*)\..*">
<source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
</location>
-
<location regexp="(.*)/optional/(.*)\..*">
<source href="classpath:/xdocs/samples/xhtml2/DOES_NOT_EXIST.html"/>
- <source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
+ <source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
</location>
-
<location regexp="(.*)/required/(.*)\..*">
<source href="classpath:/xdocs/samples/xhtml2/DOES_NOT_EXIST.html" required="true"/>
- <source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
+ <source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
</location>
-
<location regexp="(.*)/aggregate/(.*)\..*">
<aggregate>
- <source href="classpath:/xdocs/samples/xhtml2/second_sample.html"/>
- <source href="classpath:/xdocs/samples/xhtml2/DOES_NOT_EXIST.html" required="false"/>
- <source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
+ <source href="classpath:/xdocs/samples/xhtml2/second_sample.html"/>
+ <source href="classpath:/xdocs/samples/xhtml2/DOES_NOT_EXIST.html" required="false"/>
+ <source href="classpath:/xdocs/samples/xhtml2/$(2).html"/>
</aggregate>
</location>
-
-</locationmap>
\ No newline at end of file
+</locationmap>
Modified: forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/sample_simple.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/sample_simple.html?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/sample_simple.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/sample_simple.html Mon Apr 9 23:05:03 2007
@@ -17,22 +17,19 @@
-->
<!--
Do we need to incorporate this somewhere ?-->
-
<?xml-stylesheet type="text/css"
href="http://www.w3.org/MarkUp/style/xhtml2.css"?>
<html xmlns="http://www.w3.org/2002/06/xhtml2" xml:lang="en"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>XHTML 2 Simple Sample Page</title>
- <meta property="abstract">A second sample page, this one is really simple.</meta>
- </head>
- <body>
-
- <h>This is a second sample page, it has nothing useful in it, but can be used
+ <meta property="abstract">A second sample page, this one is really simple.</meta>
+ </head>
+ <body>
+ <h>This is a second sample page, it has nothing useful in it, but can be used
to illustrate aggregation. If the page you are viewing has more content than this
paragraph then this document has been aggregated with another.</h>
-
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/second_sample.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/second_sample.html?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/second_sample.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/second_sample.html Mon Apr 9 23:05:03 2007
@@ -17,19 +17,19 @@
-->
<!--
Do we need to incorporate this somewhere ?-->
-
<?xml-stylesheet type="text/css"
href="http://www.w3.org/MarkUp/style/xhtml2.css"?>
<html xmlns="http://www.w3.org/2002/06/xhtml2" xml:lang="en"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>XHTML 2 Second Sample Page</title>
- </head>
- <body>
-
- <h>A Second Sample Page</h>
- <p>This is the content of the second sample page, not much here.</p>
+ </head>
+ <body>
+ <h>A Second Sample Page</h>
+ <p>
+ This is the content of the second sample page, not much here.
+ </p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xml/helloWorld.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xml/helloWorld.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xml/helloWorld.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xml/helloWorld.xml Mon Apr 9 23:05:03 2007
@@ -17,4 +17,4 @@
-->
<document>
<name>Hello</name>
-</document>
\ No newline at end of file
+</document>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-codec/ivy-1.3.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-codec/ivy-1.3.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-codec/ivy-1.3.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-codec/ivy-1.3.xml Mon Apr 9 23:05:03 2007
@@ -1,9 +1,9 @@
<ivy-module version="1.0">
- <info organisation="apache" module="commons-codec" revision="1.3" status="release" publication="20061118204226" default="true"/>
- <configurations>
- <conf name="default" visibility="public"/>
- </configurations>
- <publications>
- <artifact name="commons-codec" type="jar" ext="jar" conf="default"/>
- </publications>
+ <info organisation="apache" module="commons-codec" revision="1.3" status="release" publication="20061118204226" default="true"/>
+ <configurations>
+ <conf name="default" visibility="public"/>
+ </configurations>
+ <publications>
+ <artifact name="commons-codec" type="jar" ext="jar" conf="default"/>
+ </publications>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-collections/ivy-3.2.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-collections/ivy-3.2.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-collections/ivy-3.2.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-collections/ivy-3.2.xml Mon Apr 9 23:05:03 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="apache" module="commons-collections" revision="3.2" status="release" publication="20061027232500">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
- </info>
+ <info organisation="apache" module="commons-collections" revision="3.2" status="release" publication="20061027232500">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-dbcp/ivy-1.2.1.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-dbcp/ivy-1.2.1.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-dbcp/ivy-1.2.1.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-dbcp/ivy-1.2.1.xml Mon Apr 9 23:05:03 2007
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="apache" module="commons-dbcp" revision="1.2.1" status="release" publication="20061027232928">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
- </info>
- <dependencies>
- <dependency org="apache" name="commons-collections" rev="3.2"/>
- <dependency org="apache" name="commons-pool" rev="1.3"/>
- </dependencies>
+ <info organisation="apache" module="commons-dbcp" revision="1.2.1" status="release" publication="20061027232928">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ </info>
+ <dependencies>
+ <dependency org="apache" name="commons-collections" rev="3.2"/>
+ <dependency org="apache" name="commons-pool" rev="1.3"/>
+ </dependencies>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-httpclient/ivy-3.1-alpha1.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-httpclient/ivy-3.1-alpha1.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-httpclient/ivy-3.1-alpha1.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-httpclient/ivy-3.1-alpha1.xml Mon Apr 9 23:05:03 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="apache" module="commons-httpclient" revision="3.1-alpha1" status="milestone">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
- </info>
+ <info organisation="apache" module="commons-httpclient" revision="3.1-alpha1" status="milestone">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.0.4.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.0.4.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.0.4.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.0.4.xml Mon Apr 9 23:05:03 2007
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="apache" module="commons-logging" revision="1.0.4" status="release" publication="20040615212900">
- <license name="Apache" url="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
- <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
-
- <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
- <repository name="ibiblio" url="http://www.ibiblio.org/maven/" pattern="[module]/jars/[artifact]-[revision].jar" ivys="false" artifacts="true"/>
-
- <description homepage="http://jakarta.apache.org/commons/logging/">
- Commons-Logging is a wrapper around a variety of logging API implementations.<br/>
- </description>
- </info>
+ <info organisation="apache" module="commons-logging" revision="1.0.4" status="release" publication="20040615212900">
+ <license name="Apache" url="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+ <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
+ <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+ <repository name="ibiblio" url="http://www.ibiblio.org/maven/" pattern="[module]/jars/[artifact]-[revision].jar" ivys="false" artifacts="true"/>
+ <description homepage="http://jakarta.apache.org/commons/logging/">
+ Commons-Logging is a wrapper around a variety of logging API
+ implementations.
+ <br/>
+ </description>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.1.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.1.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.1.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.1.xml Mon Apr 9 23:05:03 2007
@@ -1,15 +1,15 @@
<ivy-module version="1.0">
- <info organisation="apache"
+ <info organisation="apache"
module="commons-logging"
revision="1.1"
status="release"
publication="20061027233010"
default="true"
/>
- <configurations>
- <conf name="default" visibility="public"/>
- </configurations>
- <publications>
- <artifact name="commons-logging" type="jar" ext="jar" conf="default"/>
- </publications>
+ <configurations>
+ <conf name="default" visibility="public"/>
+ </configurations>
+ <publications>
+ <artifact name="commons-logging" type="jar" ext="jar" conf="default"/>
+ </publications>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-pool/ivy-1.3.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-pool/ivy-1.3.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-pool/ivy-1.3.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-pool/ivy-1.3.xml Mon Apr 9 23:05:03 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="apache" module="commons-pool" revision="1.3" status="release" publication="20061027232652">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
- </info>
+ <info organisation="apache" module="commons-pool" revision="1.3" status="release" publication="20061027232652">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/log4j/ivy-1.2.14.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/log4j/ivy-1.2.14.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/log4j/ivy-1.2.14.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/log4j/ivy-1.2.14.xml Mon Apr 9 23:05:03 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="apache" module="log4j" revision="1.2.14" status="release" publication="20061022022504">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
- </info>
+ <info organisation="apache" module="log4j" revision="1.2.14" status="release" publication="20061022022504">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/xerces/ivy-2.5.0.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/xerces/ivy-2.5.0.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/xerces/ivy-2.5.0.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/xerces/ivy-2.5.0.xml Mon Apr 9 23:05:03 2007
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="apache" module="xerces" revision="2.5.0" status="release" publication="20030922151400">
- <license name="Apache" url="http://xml.apache.org/LICENSE"/>
- <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
-
- <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
- <repository name="ibiblio" url="http://www.ibiblio.org/maven/" pattern="[module]/jars/[artifact]-[revision].jar" ivys="false" artifacts="true"/>
-
- <description homepage="http://xml.apache.org/xerces2-j/">
- Xerces2 is a high performance, fully compliant XML parsers in the Apache Xerces family.<br/>
- Xerces seems to have a dependency on xml apis, but it's difficult to know exactly
- on which version, cause xml apis seems to be themselves a bundle of several
- xml apis, each having their own revisions. For the moment, this dependency is not
- described in this ivy file, and should thus be expressed in your ivy file if you depend
- on xerces.
- </description>
- </info>
- <publications>
- <artifact name="xercesImpl" type="jar" conf="default"/>
- </publications>
+ <info organisation="apache" module="xerces" revision="2.5.0" status="release" publication="20030922151400">
+ <license name="Apache" url="http://xml.apache.org/LICENSE"/>
+ <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
+ <repository name="ivyrep" url="http://www.jayasoft.fr/org/ivyrep/" pattern="[organisation]/[module]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+ <repository name="ibiblio" url="http://www.ibiblio.org/maven/" pattern="[module]/jars/[artifact]-[revision].jar" ivys="false" artifacts="true"/>
+ <description homepage="http://xml.apache.org/xerces2-j/">
+ Xerces2 is a high performance, fully compliant XML parsers in the Apache
+ Xerces family.
+ <br/>
+ Xerces seems to have a dependency on xml apis, but it's difficult to know
+ exactly on which version, cause xml apis seems to be themselves a bundle
+ of several xml apis, each having their own revisions. For the moment, this
+ dependency is not described in this ivy file, and should thus be expressed
+ in your ivy file if you depend on xerces.
+ </description>
+ </info>
+ <publications>
+ <artifact name="xercesImpl" type="jar" conf="default"/>
+ </publications>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-commons/ivy-2.2.2.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-commons/ivy-2.2.2.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-commons/ivy-2.2.2.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-commons/ivy-2.2.2.xml Mon Apr 9 23:05:03 2007
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="asm" module="asm-commons" revision="2.2.2" status="release" publication="20061021235420">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
-
- <description homepage="http://www.springframework.org/">
- ASM is a Java bytecode manipulation framework. It can be used to dynamically generate stub classes or other proxy classes, directly in binary form, or to dynamically modify classes at load time, i.e., just before they are loaded into the Java Virtual Machine.
- </description>
- </info>
+ <info organisation="asm" module="asm-commons" revision="2.2.2" status="release" publication="20061021235420">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ <description homepage="http://www.springframework.org/">
+ ASM is a Java bytecode manipulation framework. It can be used to
+ dynamically generate stub classes or other proxy classes, directly in
+ binary form, or to dynamically modify classes at load time, i.e., just
+ before they are loaded into the Java Virtual Machine.
+ </description>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-util/ivy-2.2.2.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-util/ivy-2.2.2.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-util/ivy-2.2.2.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-util/ivy-2.2.2.xml Mon Apr 9 23:05:03 2007
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="asm" module="asm-util" revision="2.2.2" status="release" publication="20061021235434">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
-
- <description homepage="http://www.springframework.org/">
- ASM is a Java bytecode manipulation framework. It can be used to dynamically generate stub classes or other proxy classes, directly in binary form, or to dynamically modify classes at load time, i.e., just before they are loaded into the Java Virtual Machine.
- </description>
- </info>
+ <info organisation="asm" module="asm-util" revision="2.2.2" status="release" publication="20061021235434">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ <description homepage="http://www.springframework.org/">
+ ASM is a Java bytecode manipulation framework. It can be used to
+ dynamically generate stub classes or other proxy classes, directly in
+ binary form, or to dynamically modify classes at load time, i.e., just
+ before they are loaded into the Java Virtual Machine.
+ </description>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm/ivy-2.2.2.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm/ivy-2.2.2.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm/ivy-2.2.2.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm/ivy-2.2.2.xml Mon Apr 9 23:05:03 2007
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="asm" module="asm" revision="2.2.2" status="release" publication="20061021235202">
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
-
- <license name="ObjectWeb" url="http://asm.objectweb.org/license.html"/>
-
- <description>
- ASM is a Java bytecode manipulation framework. It can be used to dynamically generate stub classes or other proxy classes, directly in binary form, or to dynamically modify classes at load time, i.e., just before they are loaded into the Java Virtual Machine.
- </description>
- </info>
+ <info organisation="asm" module="asm" revision="2.2.2" status="release" publication="20061021235202">
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ <license name="ObjectWeb" url="http://asm.objectweb.org/license.html"/>
+ <description>
+ ASM is a Java bytecode manipulation framework. It can be used to
+ dynamically generate stub classes or other proxy classes, directly in
+ binary form, or to dynamically modify classes at load time, i.e., just
+ before they are loaded into the Java Virtual Machine.
+ </description>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/cglib/cglib-nodep/ivy-2.1_3.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/cglib/cglib-nodep/ivy-2.1_3.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/cglib/cglib-nodep/ivy-2.1_3.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/cglib/cglib-nodep/ivy-2.1_3.xml Mon Apr 9 23:05:03 2007
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="cglib" module="cglib-nodep" revision="2.1_3" status="release" publication="20061025012108">
- <license name="Apache Software License"/>
- <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
- </info>
+ <info organisation="cglib" module="cglib-nodep" revision="2.1_3" status="release" publication="20061025012108">
+ <license name="Apache Software License"/>
+ <ivyauthor name="The Apache Software Foundation" url="http://www.apache.org/"/>
+ </info>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/jtidy/jtidy/ivy-4aug2000r7-dev.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/jtidy/jtidy/ivy-4aug2000r7-dev.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/jtidy/jtidy/ivy-4aug2000r7-dev.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/jtidy/jtidy/ivy-4aug2000r7-dev.xml Mon Apr 9 23:05:03 2007
@@ -1,9 +1,9 @@
<ivy-module version="1.0">
- <info organisation="jtidy" module="jtidy" revision="4aug2000r7-dev" status="release" publication="20061118203324" default="true"/>
- <configurations>
- <conf name="default" visibility="public"/>
- </configurations>
- <publications>
- <artifact name="jtidy" type="jar" ext="jar" conf="default"/>
- </publications>
+ <info organisation="jtidy" module="jtidy" revision="4aug2000r7-dev" status="release" publication="20061118203324" default="true"/>
+ <configurations>
+ <conf name="default" visibility="public"/>
+ </configurations>
+ <publications>
+ <artifact name="jtidy" type="jar" ext="jar" conf="default"/>
+ </publications>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/junit/junit/ivy-4.1.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/junit/junit/ivy-4.1.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/junit/junit/ivy-4.1.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/junit/junit/ivy-4.1.xml Mon Apr 9 23:05:03 2007
@@ -1,9 +1,9 @@
<ivy-module version="1.0">
- <info organisation="junit" module="junit" revision="4.1" status="release" publication="20061118211158" default="true"/>
- <configurations>
- <conf name="default" visibility="public"/>
- </configurations>
- <publications>
- <artifact name="junit" type="jar" ext="jar" conf="default"/>
- </publications>
+ <info organisation="junit" module="junit" revision="4.1" status="release" publication="20061118211158" default="true"/>
+ <configurations>
+ <conf name="default" visibility="public"/>
+ </configurations>
+ <publications>
+ <artifact name="junit" type="jar" ext="jar" conf="default"/>
+ </publications>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/springframework/springframework/ivy-2.0.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/springframework/springframework/ivy-2.0.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/springframework/springframework/ivy-2.0.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/springframework/springframework/ivy-2.0.xml Mon Apr 9 23:05:03 2007
@@ -1,37 +1,34 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module version="1.0">
- <info organisation="springframework"
+ <info organisation="springframework"
module="springframework"
revision="2.0"
status="release">
<license name="Apache" url="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-
- <description homepage="http://www.springframework.org/">
- A popular full-stack Java/J2EE application framework, Spring delivers significant benefits for many projects, reducing development effort and costs while improving test coverage and quality.
-
- Note:
- This ivy file is a work in progress, and doesn't cover all spring 2.0 dependencies or modules.
- </description>
- </info>
-
- <configurations>
- <conf name="core" description="core utilities"/>
- <conf name="mock" description="JNDI mocks, Servlet API mocks" extends="core"/>
- </configurations>
-
- <publications>
- <artifact name="spring" type="jar" conf="core"/>
- <artifact name="spring-mock" type="jar" conf="mock"/>
- </publications>
-
- <dependencies>
- <dependency org="apache" name="commons-dbcp" rev="1.2.1"/>
- <dependency org="apache" name="commons-logging" rev="1.1"/>
- <dependency org="apache" name="log4j" rev="1.2.14"/>
- <dependency org="asm" name="asm" rev="2.2.2"/>
- <dependency org="asm" name="asm-commons" rev="2.2.2"/>
- <dependency org="asm" name="asm-util" rev="2.2.2"/>
- <dependency org="cglib" name="cglib-nodep" rev="2.1_3"/>
- </dependencies>
+ <description homepage="http://www.springframework.org/">
+ A popular full-stack Java/J2EE application framework, Spring delivers
+ significant benefits for many projects, reducing development effort and
+ costs while improving test coverage and quality. Note: This ivy file is a
+ work in progress, and doesn't cover all spring 2.0 dependencies or
+ modules.
+ </description>
+ </info>
+ <configurations>
+ <conf name="core" description="core utilities"/>
+ <conf name="mock" description="JNDI mocks, Servlet API mocks" extends="core"/>
+ </configurations>
+ <publications>
+ <artifact name="spring" type="jar" conf="core"/>
+ <artifact name="spring-mock" type="jar" conf="mock"/>
+ </publications>
+ <dependencies>
+ <dependency org="apache" name="commons-dbcp" rev="1.2.1"/>
+ <dependency org="apache" name="commons-logging" rev="1.1"/>
+ <dependency org="apache" name="log4j" rev="1.2.14"/>
+ <dependency org="asm" name="asm" rev="2.2.2"/>
+ <dependency org="asm" name="asm-commons" rev="2.2.2"/>
+ <dependency org="asm" name="asm-util" rev="2.2.2"/>
+ <dependency org="cglib" name="cglib-nodep" rev="2.1_3"/>
+ </dependencies>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/WEB-INF/web.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/WEB-INF/web.xml (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/WEB-INF/web.xml Mon Apr 9 23:05:03 2007
@@ -21,15 +21,15 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<servlet>
- <description>Provides a webapp interface to the Forrest publishing engine</description>
+ <description>
+ Provides a webapp interface to the Forrest publishing engine
+ </description>
<display-name>Forrest Webapp</display-name>
<servlet-name>ForrestController</servlet-name>
<servlet-class>org.apache.forrest.webapp.ForrestController</servlet-class>
</servlet>
-
<servlet-mapping>
<servlet-name>ForrestController</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-
</web-app>
Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/jettyconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/jettyconf.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/jettyconf.xml (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/jettyconf.xml Mon Apr 9 23:05:03 2007
@@ -16,28 +16,24 @@
limitations under the License.
-->
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
-
-
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
<!-- =============================================================== -->
-
<Configure class="org.mortbay.jetty.Server">
-
- <!-- =============================================================== -->
- <!-- Configure the Request Listeners -->
- <!-- =============================================================== -->
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add and configure a HTTP listener to port 8888 -->
- <!-- The default port can also be changed using: -->
- <!-- forrest run -Dforrest.jvmargs="-Djetty.port=80" -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- =============================================================== -->
+<!-- Configure the Request Listeners -->
+<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add and configure a HTTP listener to port 8888 -->
+<!-- The default port can also be changed using: -->
+<!-- forrest run -Dforrest.jvmargs="-Djetty.port=80" -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Call name="addListener">
<Arg>
<New class="org.mortbay.http.SocketListener">
- <Set name="Port"><SystemProperty name="jetty.port" default="8888"/></Set>
+ <Set name="Port">
+ <SystemProperty name="jetty.port" default="8888"/>
+ </Set>
<Set name="MinThreads">5</Set>
<Set name="MaxThreads">100</Set>
<Set name="MaxIdleTimeMs">30000</Set>
@@ -45,34 +41,27 @@
</New>
</Arg>
</Call>
-
-
- <!-- =============================================================== -->
- <!-- Configure the Contexts -->
- <!-- =============================================================== -->
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add root context web applications. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add a all web application within the webapps directory. -->
- <!-- + No virtual host specified -->
- <!-- + Look in the webapps directory relative to jetty.home or . -->
- <!-- + Use the webdefault.xml resource for the defaults descriptor -->
- <!-- + Upack the war file -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
+<!-- =============================================================== -->
+<!-- Configure the Contexts -->
+<!-- =============================================================== -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add root context web applications. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Add a all web application within the webapps directory. -->
+<!-- + No virtual host specified -->
+<!-- + Look in the webapps directory relative to jetty.home or . -->
+<!-- + Use the webdefault.xml resource for the defaults descriptor -->
+<!-- + Upack the war file -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Call name="addWebApplication">
<Arg>/</Arg>
- <Arg><!--<SystemProperty name="jetty.home" default="."/>-->.</Arg>
+ <Arg>
+<!--<SystemProperty name="jetty.home" default="."/>-->.</Arg>
</Call>
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Build a context manually. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<!-- Build a context manually. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!--
<Call name="addContext">
<Arg>/forrest/*</Arg>
Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml Mon Apr 9 23:05:03 2007
@@ -16,92 +16,74 @@
limitations under the License.
-->
<project xmlns:ivy="antlib:fr.jayasoft.ivy.ant" name="forrest2-webapp" default="run">
-
- <property file="local.build.properties" />
-
- <property name="project.name" value="forrest2" />
-
- <property name="project.core.src.dir" location="src/core" />
- <property name="project.core.test.src.dir" location="src/test" />
-
- <property name="project.dist.dir" location="dist" />
- <property name="project.build.classes.dir" location="build/classes" />
- <property name="test.reports" location="build/reports" />
-
- <property name="compile.debug" value="off" />
-
- <property name="ivy.jar.dir" location="tools/ivy" />
-
- <!-- try to load ivy here from local tools/ivy dir, in case the user has not already dropped
+ <property file="local.build.properties" />
+ <property name="project.name" value="forrest2" />
+ <property name="project.core.src.dir" location="src/core" />
+ <property name="project.core.test.src.dir" location="src/test" />
+ <property name="project.dist.dir" location="dist" />
+ <property name="project.build.classes.dir" location="build/classes" />
+ <property name="test.reports" location="build/reports" />
+ <property name="compile.debug" value="off" />
+ <property name="ivy.jar.dir" location="tools/ivy" />
+<!-- try to load ivy here from local tools/ivy dir, in case the user has not already dropped
it into ant's lib dir (note that the latter copy will always take precedence).
We will not fail as long as local lib dir exists (it may be empty) and
ivy is in at least one of ant's lib dir or the local lib dir. -->
- <path id="ivy.lib.path">
- <fileset dir="${ivy.jar.dir}" includes="*.jar" />
- </path>
-
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path" />
-
- <target name="clean">
- <delete dir="${project.build.classes.dir}" />
- <delete dir="${project.dist.dir}" />
- </target>
-
- <target name="init" depends="clean">
- <mkdir dir="${project.build.classes.dir}" />
- <mkdir dir="${project.dist.dir}" />
- <ivy:cachepath pathid="lib.path.id" conf="default" />
- </target>
-
-
- <target name="run" depends="init" description="* Run Jetty (instant live webapp)" >
- <echo>
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar" />
+ </path>
+ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path" />
+ <target name="clean">
+ <delete dir="${project.build.classes.dir}" />
+ <delete dir="${project.dist.dir}" />
+ </target>
+ <target name="init" depends="clean">
+ <mkdir dir="${project.build.classes.dir}" />
+ <mkdir dir="${project.dist.dir}" />
+ <ivy:cachepath pathid="lib.path.id" conf="default" />
+ </target>
+ <target name="run" depends="init" description="* Run Jetty (instant live webapp)" >
+ <echo>
Note: Use Ctrl-C to stop the Jetty server
</echo>
- <if>
- <os family="dos" />
- <then>
- <echo>
+ <if>
+ <os family="dos" />
+ <then>
+ <echo>
... and reply 'n' and press [Enter]
when asked about aborting the batch!
</echo>
- </then>
- </if>
- <java classname="org.mortbay.jetty.Server"
+ </then>
+ </if>
+ <java classname="org.mortbay.jetty.Server"
dir="${forrest.webapp}"
fork="yes"
maxmemory="${forrest.maxmemory}"
failonerror="yes">
- <classpath>
- <path refid="lib.path.id" />
- </classpath>
- <jvmarg line="${forrest.jvmargs}" />
- <arg value="${forrest.webapp}/jettyconf.xml" />
- </java>
- </target>
-
-
- <!-- =================================
+ <classpath>
+ <path refid="lib.path.id" />
+ </classpath>
+ <jvmarg line="${forrest.jvmargs}" />
+ <arg value="${forrest.webapp}/jettyconf.xml" />
+ </java>
+ </target>
+<!-- =================================
Ivy Targets
================================= -->
- <target name="resolve">
- <ivy:configure file="./ivyconf.xml" />
- <ivy:resolve file="ivy.xml" conf="default" />
- </target>
-
- <target name="retrieve-default" depends="resolve">
- <ivy:retrieve pattern="lib/default/[artifact]-[revision].[ext]" conf="default" />
- </target>
-
- <target name="retrieve-test" depends="resolve">
- <ivy:retrieve pattern="lib/test/[artifact]-[revision].[ext]" conf="test" />
- </target>
-
- <target name="retrieve-all" depends="resolve">
- <ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" conf="*" />
- </target>
-
- <target name="deliver" depends="retrieve-all">
- <ivy:deliver deliverpattern="distrib/[artifact]-[revision].[ext]" pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
- </target>
+ <target name="resolve">
+ <ivy:configure file="./ivyconf.xml" />
+ <ivy:resolve file="ivy.xml" conf="default" />
+ </target>
+ <target name="retrieve-default" depends="resolve">
+ <ivy:retrieve pattern="lib/default/[artifact]-[revision].[ext]" conf="default" />
+ </target>
+ <target name="retrieve-test" depends="resolve">
+ <ivy:retrieve pattern="lib/test/[artifact]-[revision].[ext]" conf="test" />
+ </target>
+ <target name="retrieve-all" depends="resolve">
+ <ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" conf="*" />
+ </target>
+ <target name="deliver" depends="retrieve-all">
+ <ivy:deliver deliverpattern="distrib/[artifact]-[revision].[ext]" pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
+ </target>
</project>
Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml Mon Apr 9 23:05:03 2007
@@ -16,27 +16,24 @@
limitations under the License.
-->
<ivy-module version="1.0">
- <info
+ <info
organisation="Apache"
module="forrest2"
- status="integration">
- </info>
-
- <configurations>
- <conf name="default"/>
- <conf name="test" extends="default"/>
- </configurations>
-
- <dependencies>
- <dependency org="apache" name="commons-httpclient" rev="latest.milestone" />
- <dependency org="apache" name="commons-codec" rev="1.3" />
- <dependency org="apache" name="commons-logging" rev="latest.release"/>
- <dependency org="apache" name="regexp" rev="latest.milestone" />
- <dependency org="apache" name="xerces" rev="latest.release"/>
- <dependency org="jtidy" name="jtidy" rev="4aug2000r7-dev"/>
- <dependency org="junit" name="junit" rev="4.1"/>
- <dependency org="springframework" name="springframework" rev="latest.release">
- <conf name="core"/>
- </dependency>
- </dependencies>
+ status="integration"></info>
+ <configurations>
+ <conf name="default"/>
+ <conf name="test" extends="default"/>
+ </configurations>
+ <dependencies>
+ <dependency org="apache" name="commons-httpclient" rev="latest.milestone" />
+ <dependency org="apache" name="commons-codec" rev="1.3" />
+ <dependency org="apache" name="commons-logging" rev="latest.release"/>
+ <dependency org="apache" name="regexp" rev="latest.milestone" />
+ <dependency org="apache" name="xerces" rev="latest.release"/>
+ <dependency org="jtidy" name="jtidy" rev="4aug2000r7-dev"/>
+ <dependency org="junit" name="junit" rev="4.1"/>
+ <dependency org="springframework" name="springframework" rev="latest.release">
+ <conf name="core"/>
+ </dependency>
+ </dependencies>
</ivy-module>
Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivyconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivyconf.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivyconf.xml (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivyconf.xml Mon Apr 9 23:05:03 2007
@@ -16,9 +16,8 @@
limitations under the License.
-->
<ivyconf>
- <property name="local.repo.dir" value="${ivy.conf.dir}/tools/ivy/repository"/>
+ <property name="local.repo.dir" value="${ivy.conf.dir}/tools/ivy/repository"/>
<property name="ibiblio-maven2-root" value="http://www.ibiblio.org/maven2/"/>
-
<conf defaultResolver="default"/>
<resolvers>
<ivyrep name="ivyrep" ivyroot="http://ivyrep.jayasoft.org/"/>
@@ -28,19 +27,18 @@
pattern="${ibiblio-maven2-pattern}"
m2compatible="true"
namespace="ibiblio-maven2"
- />
+ />
<filesystem name="local-repository">
<ivy pattern="${local.repo.dir}/[organisation]/[module]/ivy-[revision].xml"/>
<artifact pattern="${local.repo.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
</filesystem>
-
<chain name="default" returnFirst="true">
<resolver ref="local-repository"/>
- <!--
+<!--
<ivyrep name="ivyrep"/>
<ivyrep name="ivyrepsandbox"/>
<ibiblio name="ibiblio-maven2"/>
-->
</chain>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivyconf>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/forrestContext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/forrestContext.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/forrestContext.xml (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/forrestContext.xml Mon Apr 9 23:05:03 2007
@@ -16,36 +16,28 @@
limitations under the License.
-->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-
- <!-- ============================================= -->
- <!-- Readers -->
- <!-- ============================================= -->
-
- <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
- <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
- <bean id="navigation" class="org.apache.forrest.examples.reader.NavigationReader"></bean>
-
- <!-- ============================================= -->
- <!-- Input Plugins -->
- <!-- ============================================= -->
-
- <bean id="org.apache.forrest.example.Navigation"
+<beans>
+<!-- ============================================= -->
+<!-- Readers -->
+<!-- ============================================= -->
+ <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
+ <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
+ <bean id="navigation" class="org.apache.forrest.examples.reader.NavigationReader"></bean>
+<!-- ============================================= -->
+<!-- Input Plugins -->
+<!-- ============================================= -->
+ <bean id="org.apache.forrest.example.Navigation"
class="org.apache.forrest.core.plugin.XSLTInputPlugin">
- <property name="xsltURL"
+ <property name="xsltURL"
value="src/xslt/navigation-to-internal.xsl" />
- </bean>
-
- <!-- ============================================= -->
- <!-- Output Plugins -->
- <!-- ============================================= -->
-
- <bean id="html-output"
+ </bean>
+<!-- ============================================= -->
+<!-- Output Plugins -->
+<!-- ============================================= -->
+ <bean id="html-output"
class="org.apache.forrest.core.plugin.XSLTOutputPlugin">
- <property name="pattern" value="html" />
- <property name="xsltPath"
+ <property name="pattern" value="html" />
+ <property name="xsltPath"
value="/xdocs/samples/xslt/internal-to-html.xsl" />
- </bean>
-
+ </bean>
</beans>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/BasePage.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/BasePage.html?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/BasePage.html (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/BasePage.html Mon Apr 9 23:05:03 2007
@@ -17,29 +17,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.sourceforge.net/" xml:lang="en" lang="en">
- <head>
- <title>Forrest2-Wicket Integration Example</title>
- <link type="text/css" rel="stylesheet" href="/screen.css" />
- </head>
- <body>
- <div class="container">
- <div wicket:id="header" id="header">
+ <head>
+ <title>Forrest2-Wicket Integration Example</title><link type="text/css" rel="stylesheet" href="/screen.css" />
+ </head>
+ <body>
+ <div class="container">
+ <div wicket:id="header" id="header">
FIXME: Header goes here
</div>
-
- <div id="leftbar">
- <div wicket:id="mainNavigation" id="nav-section">
+ <div id="leftbar">
+ <div wicket:id="mainNavigation" id="nav-section">
FIXME: mainNavigation goes here
</div>
- </div>
-
- <div id="content">
- <wicket:child />
- </div>
-
- <div wicket:id="footer" id="footer">
+ </div>
+ <div id="content">
+ <wicket:child />
+ </div>
+ <div wicket:id="footer" id="footer">
FIXME: Footer Goes here
</div>
- </div>
- </body>
+ </div>
+ </body>
</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/Home.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/Home.html?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/Home.html (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/Home.html Mon Apr 9 23:05:03 2007
@@ -15,14 +15,11 @@
limitations under the License.
-->
<html xmlns:wicket="http://wicket.sourceforge.net/">
-<head>
- <title>Wicket Examples - signin</title>
- <link rel="stylesheet" type="text/css" href="style.css"/>
-</head>
-<body>
+ <head>
+ <title>Wicket Examples - signin</title><link rel="stylesheet" type="text/css" href="style.css"/>
+ </head>
+ <body>
<span wicket:id="mainNavigation"/>
-
<h2>Welcome!</h2>
-
-</body>
+ </body>
</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html Mon Apr 9 23:05:03 2007
@@ -17,15 +17,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.sourceforge.net/" xml:lang="en" lang="en">
- <head>
- <title>Forrest2-Wicket Integration Example</title>
- <link type="text/css" rel="stylesheet" href="/screen.css" />
- </head>
- <body>
- <wicket:extend>
- <div wicket:id="body">
+ <head>
+ <title>Forrest2-Wicket Integration Example</title><link type="text/css" rel="stylesheet" href="/screen.css" />
+ </head>
+ <body>
+ <wicket:extend>
+ <div wicket:id="body">
FIXME: Body goes here
</div>
- </wicket:extend>
- </body>
+ </wicket:extend>
+ </body>
</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/locationmap.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/locationmap.xml (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/locationmap.xml Mon Apr 9 23:05:03 2007
@@ -20,28 +20,24 @@
<source href="classpath:/panel/header/$(1).xhtml2"/>
<source href="classpath:/panel/header/default.xhtml2"/>
</location>
-
<location regexp="navigation/(.*/)*(.*)\..*">
<source href="navigation:classpath:/$(1)navigation.xml"/>
<source href="navigation:classpath:/navigation.xml"/>
</location>
-
- <!--
+<!--
<location regexp="body/.*forrest2/docs/(.*/)*(.*)\..*">
<source href="file:///D:/openSource/forrest/whiteboard/forrest2/core/src/docs/$(1)$(2).html"/>
<source href="classpath:/notFound.xhtml2"/>
</location>
-->
-
<location regexp="body/(.*/)*(.*)\..*">
<source href="classpath:/$(1)$(2).xhtml2"/>
<source href="classpath:/$(1)notFound.xhtml2"/>
<source href="classpath:/$(2).xhtml2"/>
<source href="classpath:/notFound.xhtml2"/>
</location>
-
<location regexp="footer/(.*)\..*">
<source href="classpath:/panel/footer/$(1).xhtml2"/>
<source href="classpath:/panel/footer/default.xhtml2"/>
</location>
-</locationmap>
\ No newline at end of file
+</locationmap>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/WEB-INF/web.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/WEB-INF/web.xml (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/WEB-INF/web.xml Mon Apr 9 23:05:03 2007
@@ -18,9 +18,7 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
-
<web-app>
-
<servlet>
<servlet-name>WicketApplication</servlet-name>
<servlet-class>wicket.protocol.http.WicketServlet</servlet-class>
@@ -30,11 +28,8 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
-
<servlet-mapping>
<servlet-name>WicketApplication</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-
</web-app>
-
\ No newline at end of file
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,19 +20,21 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>Forrest2 and Wicket Integration Example</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Welcome to the Forrest2 and Wicket Integration Example</h>
- <p>This example site illustrates how to inegrate the
- Forrest2 XML publication engine and the Wicket web
- application engine.</p>
-
- <p>Here are some pages to visit:</p>
+ <p>
+ This example site illustrates how to inegrate the Forrest2 XML publication
+ engine and the Wicket web application engine.
+ </p>
+ <p>
+ Here are some pages to visit:
+ </p>
<ul>
<li><a href="index.html.forrestPipeline">The pipeline that generates this page</a></li>
<li><a href="subdir/index.html">Sub-Directory Index</a></li>
</ul>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml Mon Apr 9 23:05:03 2007
@@ -19,10 +19,10 @@
<item label="Subdir" href="subdir/index.html"/>
<item label="Item 2">
<item label="Item 2.1">
- <item label="Item 2.1.1"/>
- <item label="Item 2.1.2"/>
+ <item label="Item 2.1.1"/>
+ <item label="Item 2.1.2"/>
</item>
<item label="Item 2.2"/>
</item>
<item label="Forrest2 Docs" href="forrest2/docs/readme.html"/>
-</navigation>
\ No newline at end of file
+</navigation>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,12 +20,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>File Not Found</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Sorry...</h>
- <p>We can't locate the file you requested. Please follow one of the links
- available in the navigation section.</p>
+ <p>
+ We can't locate the file you requested. Please follow one of the links
+ available in the navigation section.
+ </p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/default.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/default.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/default.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/default.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,10 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>Footer</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Default Footer</h>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/index.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/index.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/index.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/index.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,10 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>Footer</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Footer</h>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/default.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/default.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/default.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/default.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,10 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>Header</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Default Header</h>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/index.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/index.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/index.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/index.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,10 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>Header</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Header</h>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,12 +20,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>Subdir Index</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Subdir Index</h>
- <p>Nothing much to see here. There is even less to see on
- <a href="missingPage.html">a missing page</a>.</p>
+ <p>
+ Nothing much to see here. There is even less to see on
+ <a href="missingPage.html">a missing page</a>.
+ </p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/navigation.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/navigation.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/navigation.xml (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/navigation.xml Mon Apr 9 23:05:03 2007
@@ -20,4 +20,4 @@
<item label="Subdir Item 1"/>
<item label="Subdir Item 2"/>
<item label="Subdir Item 3"/>
-</navigation>
\ No newline at end of file
+</navigation>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2 Mon Apr 9 23:05:03 2007
@@ -20,12 +20,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
>
- <head>
+ <head>
<title>Subdirectory File Not Found</title>
- </head>
- <body>
+ </head>
+ <body>
<h>Sorry...</h>
- <p>We can't locate the subdirectory file you requested. Please follow one of the links
- available in the navigation section.</p>
+ <p>
+ We can't locate the subdirectory file you requested. Please follow one of
+ the links available in the navigation section.
+ </p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl Mon Apr 9 23:05:03 2007
@@ -18,55 +18,45 @@
<xsl:stylesheet version="1.0" xmlns="http://www.w3.org/2002/06/xhtml2"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:html="http://www.w3.org/2002/06/xhtml2">
-
- <xsl:template match="navigation">
- <html xmlns=" http://www.w3.org/2002/06/xhtml2"
+ <xsl:template match="navigation">
+ <html xmlns=" http://www.w3.org/2002/06/xhtml2"
xml:lang="en"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd">
- <head>
- <title>Navigation</title>
- </head>
- <body>
- <ul>
- <xsl:apply-templates/>
- </ul>
- </body>
- </html>
- </xsl:template>
-
- <!-- The item element provides a link to some otehr item in the
+ <head>
+ <title>Navigation</title>
+ </head>
+ <body>
+ <ul>
+ <xsl:apply-templates/>
+ </ul>
+ </body>
+ </html>
+ </xsl:template>
+<!-- The item element provides a link to some otehr item in the
content object. -->
- <xsl:template match="item">
- <li class="menuitem">
- <xsl:choose>
- <xsl:when test="@href">
- <a>
- <xsl:attribute name="href"><xsl:value-of select="@href"/></xsl:attribute>
- <xsl:value-of select="@label"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="@label"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:if test="item">
- <ul>
- <xsl:apply-templates/>
- </ul>
- </xsl:if>
- </li>
- </xsl:template>
-
- <!-- The parent element provides a link back to the
+ <xsl:template match="item">
+ <li class="menuitem"><xsl:choose>
+ <xsl:when test="@href"><a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="@href"/>
+ </xsl:attribute>
+ <xsl:value-of select="@label"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@label"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:if test="item">
+ <ul>
+ <xsl:apply-templates/>
+ </ul>
+ </xsl:if></li>
+ </xsl:template>
+<!-- The parent element provides a link back to the
parent directory. -->
- <xsl:template match="parent">
- <li>
- <a href="..">
- <xsl:value-of select="@label"/>
- </a>
- </li>
-
- </xsl:template>
-
+ <xsl:template match="parent">
+ <li><a href="..">
+ <xsl:value-of select="@label"/></a></li>
+ </xsl:template>
</xsl:stylesheet>