forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r509889 - in /forrest/trunk: site-author/ whiteboard/dispatcher/ whiteboard/dispatcher/tools/ant/bin/ whiteboard/forrest2/core/ whiteboard/forrest2/core/.settings/ whiteboard/forrest2/core/src/core/org/apache/forrest/core/document/ whiteboa...
Date Wed, 21 Feb 2007 04:37:53 GMT
Author: crossley
Date: Tue Feb 20 20:37:51 2007
New Revision: 509889

URL: http://svn.apache.org/viewvc?view=rev&rev=509889
Log:
Fix DOS line-endings and svn:eol-style property.
Committers please see http://www.apache.org/dev/version-control.html#https-svn

Modified:
    forrest/trunk/site-author/forrest.properties.xml   (contents, props changed)
    forrest/trunk/whiteboard/dispatcher/dispatch   (props changed)
    forrest/trunk/whiteboard/dispatcher/tools/ant/bin/ant   (props changed)
    forrest/trunk/whiteboard/dispatcher/tools/ant/bin/antRun   (props changed)
    forrest/trunk/whiteboard/forrest2/core/.settings/org.jayasoft.ivyde.eclipse.prefs   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/.springBeans   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/document/DefaultSourceDocument.java   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/docs/debugging.html   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/docs/eclipse.html   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/docs/faq/forrest1-vs-forrest2.html   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/docs/rt/documentFactory.html   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/docs/sourceDocumentAggregation.html   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/helloWorld.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-collections/ivy-3.2.xml   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.0.4.xml   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-util/ivy-2.2.2.xml   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/.mymetadata   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/META-INF/MANIFEST.MF   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/org/apache/forrest/webapp/ForrestController.java   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/.settings/org.jayasoft.ivyde.eclipse.prefs   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/.wicketprops   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/default.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/index.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/default.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/index.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2   (contents, props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft   (contents, props changed)

Modified: forrest/trunk/site-author/forrest.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/forrest.properties.xml?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/site-author/forrest.properties.xml (original)
+++ forrest/trunk/site-author/forrest.properties.xml Tue Feb 20 20:37:51 2007
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<properties>
-  <!-- Project identity -->
-  <property name="projectInfo.project.fullname" value="Forrest"/>
-  <property name="projectInfo.project.url" value="http://forrest.apache.org/"/>
-</properties>
+<?xml version="1.0" encoding="UTF-8"?>
+<properties>
+  <!-- Project identity -->
+  <property name="projectInfo.project.fullname" value="Forrest"/>
+  <property name="projectInfo.project.url" value="http://forrest.apache.org/"/>
+</properties>

Propchange: forrest/trunk/site-author/forrest.properties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/dispatcher/dispatch
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/dispatcher/tools/ant/bin/ant
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: forrest/trunk/whiteboard/dispatcher/tools/ant/bin/antRun
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/.settings/org.jayasoft.ivyde.eclipse.prefs
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/.settings/org.jayasoft.ivyde.eclipse.prefs?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/.settings/org.jayasoft.ivyde.eclipse.prefs (original)
+++ forrest/trunk/whiteboard/forrest2/core/.settings/org.jayasoft.ivyde.eclipse.prefs Tue Feb 20 20:37:51 2007
@@ -1,5 +1,5 @@
-#Fri Nov 24 22:25:36 GMT 2006
-acceptedTypes=[inherited]
-eclipse.preferences.version=1
-ivy_conf_path=file\:/D\:/openSource/forrest/whiteboard/forrest2/core/ivyconf.xml
-retreive.pattern=none
+#Fri Nov 24 22:25:36 GMT 2006
+acceptedTypes=[inherited]
+eclipse.preferences.version=1
+ivy_conf_path=file\:/D\:/openSource/forrest/whiteboard/forrest2/core/ivyconf.xml
+retreive.pattern=none

Propchange: forrest/trunk/whiteboard/forrest2/core/.settings/org.jayasoft.ivyde.eclipse.prefs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/.springBeans
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/.springBeans?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/.springBeans (original)
+++ forrest/trunk/whiteboard/forrest2/core/.springBeans Tue Feb 20 20:37:51 2007
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-	<configExtensions>
-		<configExtension>xml</configExtension>
-	</configExtensions>
-	<configs>
-	</configs>
-	<configSets>
-	</configSets>
-</beansProjectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<configExtensions>
+		<configExtension>xml</configExtension>
+	</configExtensions>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>

Propchange: forrest/trunk/whiteboard/forrest2/core/.springBeans
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/document/DefaultSourceDocument.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/document/DefaultSourceDocument.java?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/document/DefaultSourceDocument.java (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/document/DefaultSourceDocument.java Tue Feb 20 20:37:51 2007
@@ -1,55 +1,55 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.forrest.core.document;
-
-import java.io.BufferedReader;
-import java.net.URI;
-
-/**
- * A basic source document. It holds the document as a string.
- * 
- */
-public class DefaultSourceDocument extends AbstractSourceDocument {
-
-	public DefaultSourceDocument(final URI requestURI, final String content) {
-		super(requestURI, content);
-		this.setComplete(true);
-	}
-
-	/**
-	 * Create a new stringSourceDocument that has partial data read from a
-	 * reader, and partial data left to be read.
-	 * 
-	 * @param fileData
-	 * @param reader
-	 * @param type
-	 *            The mime type of the document. May be null if unkown.
-	 */
-	public DefaultSourceDocument(final URI requestURI, final String fileData,
-			final BufferedReader reader, final String type) {
-		this(requestURI, fileData);
-		this.setReader(reader);
-		this.setComplete(false);
-		this.setType(type);
-	}
-
-	public DefaultSourceDocument(final URI requestURI, final String content, final String type) {
-		this(requestURI, content);
-		this.setComplete(true);
-		this.setType(type);
-	}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.forrest.core.document;
+
+import java.io.BufferedReader;
+import java.net.URI;
+
+/**
+ * A basic source document. It holds the document as a string.
+ * 
+ */
+public class DefaultSourceDocument extends AbstractSourceDocument {
+
+	public DefaultSourceDocument(final URI requestURI, final String content) {
+		super(requestURI, content);
+		this.setComplete(true);
+	}
+
+	/**
+	 * Create a new stringSourceDocument that has partial data read from a
+	 * reader, and partial data left to be read.
+	 * 
+	 * @param fileData
+	 * @param reader
+	 * @param type
+	 *            The mime type of the document. May be null if unkown.
+	 */
+	public DefaultSourceDocument(final URI requestURI, final String fileData,
+			final BufferedReader reader, final String type) {
+		this(requestURI, fileData);
+		this.setReader(reader);
+		this.setComplete(false);
+		this.setType(type);
+	}
+
+	public DefaultSourceDocument(final URI requestURI, final String content, final String type) {
+		this(requestURI, content);
+		this.setComplete(true);
+		this.setType(type);
+	}
 }

Propchange: forrest/trunk/whiteboard/forrest2/core/src/core/org/apache/forrest/core/document/DefaultSourceDocument.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/debugging.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/debugging.html?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/debugging.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/debugging.html Tue Feb 20 20:37:51 2007
@@ -1,36 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Debugging Forrest2 Content Objects</title>
-</head>
-<body>
-  <h1>Debugging Content Objects</h1>
-  
-  <p>Forrest2 provides some special url extensions that
-  allow a Content Object developer to debug the processing
-  a request undergoes. This document provides an overview
-  of these extensions.</p>
-  
-  <p>In all cases you simply add the extension to the request
-  URL you are working with.</p>
-  
-  <h2>.forrestPipeline</h2>
-  
-  <p>A request with this extension will return an XML
-  representation of the pipeline executed in order to 
-  create the document request.</p>
-  
-  <h2>.forrestSource</h2>
-  
-  <p>A request with this extension will return the source
-  document read by Forrest2.</p>
-  
-  <h2>.forrestInternal</h2>
-  
-  <p>A request with this extension will return the 
-  document produced when Forrest has finished processing the
-  source with the relevant internal plugins.</p>
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Debugging Forrest2 Content Objects</title>
+</head>
+<body>
+  <h1>Debugging Content Objects</h1>
+  
+  <p>Forrest2 provides some special url extensions that
+  allow a Content Object developer to debug the processing
+  a request undergoes. This document provides an overview
+  of these extensions.</p>
+  
+  <p>In all cases you simply add the extension to the request
+  URL you are working with.</p>
+  
+  <h2>.forrestPipeline</h2>
+  
+  <p>A request with this extension will return an XML
+  representation of the pipeline executed in order to 
+  create the document request.</p>
+  
+  <h2>.forrestSource</h2>
+  
+  <p>A request with this extension will return the source
+  document read by Forrest2.</p>
+  
+  <h2>.forrestInternal</h2>
+  
+  <p>A request with this extension will return the 
+  document produced when Forrest has finished processing the
+  source with the relevant internal plugins.</p>
+
+</body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/docs/debugging.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/eclipse.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/eclipse.html?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/eclipse.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/eclipse.html Tue Feb 20 20:37:51 2007
@@ -1,31 +1,31 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Building and Editing Forrest2 in Eclipse</title>
-</head>
-<body>
-
-<p class="note">These are just rough notes for now, please ask
-questions on the Dev list if you need to. If you can make these
-notes clearer then that will help too.</p>
-
-<p>You need the <a href="http://www.jayasoft.org/ivyde">IvyDE 
-plugin</a></p>
-
-<p>Once you installed that you need to right click on the 
-ivy.xml file and select "add Ivy Library". This will add a 
-special Eclipse classpath entry for the ivy dependencies.</p>
-
-<p>I think you will also need to set the path to the 
-ivyconf.xml file in the projects properties (right click 
-on the project, and select IVY).</p>
-
-<p>To update the dependencies, right click on the ivy.xml 
-Library entry in the package explorer and select "Resolve".</p>
-
-
- 
-
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Building and Editing Forrest2 in Eclipse</title>
+</head>
+<body>
+
+<p class="note">These are just rough notes for now, please ask
+questions on the Dev list if you need to. If you can make these
+notes clearer then that will help too.</p>
+
+<p>You need the <a href="http://www.jayasoft.org/ivyde">IvyDE 
+plugin</a></p>
+
+<p>Once you installed that you need to right click on the 
+ivy.xml file and select "add Ivy Library". This will add a 
+special Eclipse classpath entry for the ivy dependencies.</p>
+
+<p>I think you will also need to set the path to the 
+ivyconf.xml file in the projects properties (right click 
+on the project, and select IVY).</p>
+
+<p>To update the dependencies, right click on the ivy.xml 
+Library entry in the package explorer and select "Resolve".</p>
+
+
+ 
+
+</body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/docs/eclipse.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/faq/forrest1-vs-forrest2.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/faq/forrest1-vs-forrest2.html?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/faq/forrest1-vs-forrest2.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/faq/forrest1-vs-forrest2.html Tue Feb 20 20:37:51 2007
@@ -1,97 +1,97 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Forrest 1 Vs Forrest 2</title>
-</head>
-<body>
-  <p>This document attempts to answer the common questins
-  asked by people familiar with Forrest 1 and trying to
-  understand Forrest 2.</p>
-  
-  <h1>Where are the *.xmap files?</h1>
-  
-  <p>There aren't any.</p>
-  
-  <p>Forrest 2 does not use Cocoon as its underlying
-  framework and so we have been able to do away with
-  our sitemaps.</p>
-  
-  <h1>So where is the processing pipeline define?</h1>
-  
-  <p>In Forrest 1 the processing pipeline was defined in
-  the cocoon sitemap files. The sitemap language is very
-  powerful, but it is also very confusing for newcomers.
-  Forrest 2 recognises that since Forrest is an XML
-  publishing framework all it needs to do is read an input
-  (or set of inputs), convert them to the Forrest internal
-  format and then process them using relevant output 
-  documents. To do this we do not need the complexities of
-  the sitemap.</p>
-  
-  <p>The processing pipeline of Forrest 2 is defined in
-  forrestContext.xml. Briefly:</p>
-
-  <p>All pipelines are, essentially, a Reader -> an Input 
-  Plugin -> an Output Plugin. This is anologous to Generator
-  -> Transformaer -> Serliazer in Cocoon sitemaps.</p>
-  
-  <p>The reader provides the source document, the input 
-  plugin converts it into a document Forrest can work with
-  internally, and the output Plugin produces the required
-  output document.</p>
-  
-  <p>A client makes a query, such as "http://foo.org/bar.html".
-  This is mapped to a source document URI using the locationmap
-  (this process is almost identical to that in Forrest 1).
-  This URI will look something like "file:foo/bar.xml" or
-  "http://remote.foo.org/bar.xml".</p>
-
-  <p>Once we have this source URI we can select a reader to 
-  retrieve the document. Readers are selected based on the 
-  protocol in the source URI. The protocol corresponds to 
-  the bean id in forrestContext.xml.</p>
-
-  <p>So a source of "file://foo/bar.xml" will use the reader 
-  identified by &lt;bean id="file"...&gt; in forrestcontext.xml. 
-  Similarly, "http://remote.foo.org/bar.xml" will use the
-  reader identified by &lt;bean id="http"...&gt;.</p>
-
-  <p>The reader produces a document encapsulated in a class 
-  that exposes a getType() method. The return value of this
-  method is used to select the input plugin to use. Again 
-  selected on the bean id in forrestContext.xml</p>
-  
-  <p>Now we have the input plugin we need to get the output
-  plugin. This is selected slightly differently, because 
-  each output plugin may be used for many request URI's. For
-  example, both "html" and "htm" extensions may indicate
-  that an HTML document is required.</p>
-  
-  <p>In order to select the output plugin each plugin bean
-  defines a "pattern" property. This property is a Regular 
-  Expresion that is used to match against the original client
-  request URI. The first output plugin that is discovered is
-  the one that is used.</p>
-  
-  <p>So now we have all of our pipeline compoenents and 
-  processing can proceed.</p>
-  
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Forrest 1 Vs Forrest 2</title>
+</head>
+<body>
+  <p>This document attempts to answer the common questins
+  asked by people familiar with Forrest 1 and trying to
+  understand Forrest 2.</p>
+  
+  <h1>Where are the *.xmap files?</h1>
+  
+  <p>There aren't any.</p>
+  
+  <p>Forrest 2 does not use Cocoon as its underlying
+  framework and so we have been able to do away with
+  our sitemaps.</p>
+  
+  <h1>So where is the processing pipeline define?</h1>
+  
+  <p>In Forrest 1 the processing pipeline was defined in
+  the cocoon sitemap files. The sitemap language is very
+  powerful, but it is also very confusing for newcomers.
+  Forrest 2 recognises that since Forrest is an XML
+  publishing framework all it needs to do is read an input
+  (or set of inputs), convert them to the Forrest internal
+  format and then process them using relevant output 
+  documents. To do this we do not need the complexities of
+  the sitemap.</p>
+  
+  <p>The processing pipeline of Forrest 2 is defined in
+  forrestContext.xml. Briefly:</p>
+
+  <p>All pipelines are, essentially, a Reader -> an Input 
+  Plugin -> an Output Plugin. This is anologous to Generator
+  -> Transformaer -> Serliazer in Cocoon sitemaps.</p>
+  
+  <p>The reader provides the source document, the input 
+  plugin converts it into a document Forrest can work with
+  internally, and the output Plugin produces the required
+  output document.</p>
+  
+  <p>A client makes a query, such as "http://foo.org/bar.html".
+  This is mapped to a source document URI using the locationmap
+  (this process is almost identical to that in Forrest 1).
+  This URI will look something like "file:foo/bar.xml" or
+  "http://remote.foo.org/bar.xml".</p>
+
+  <p>Once we have this source URI we can select a reader to 
+  retrieve the document. Readers are selected based on the 
+  protocol in the source URI. The protocol corresponds to 
+  the bean id in forrestContext.xml.</p>
+
+  <p>So a source of "file://foo/bar.xml" will use the reader 
+  identified by &lt;bean id="file"...&gt; in forrestcontext.xml. 
+  Similarly, "http://remote.foo.org/bar.xml" will use the
+  reader identified by &lt;bean id="http"...&gt;.</p>
+
+  <p>The reader produces a document encapsulated in a class 
+  that exposes a getType() method. The return value of this
+  method is used to select the input plugin to use. Again 
+  selected on the bean id in forrestContext.xml</p>
+  
+  <p>Now we have the input plugin we need to get the output
+  plugin. This is selected slightly differently, because 
+  each output plugin may be used for many request URI's. For
+  example, both "html" and "htm" extensions may indicate
+  that an HTML document is required.</p>
+  
+  <p>In order to select the output plugin each plugin bean
+  defines a "pattern" property. This property is a Regular 
+  Expresion that is used to match against the original client
+  request URI. The first output plugin that is discovered is
+  the one that is used.</p>
+  
+  <p>So now we have all of our pipeline compoenents and 
+  processing can proceed.</p>
+  
+</body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/docs/faq/forrest1-vs-forrest2.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html Tue Feb 20 20:37:51 2007
@@ -1,64 +1,64 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Getting Started</title>
-</head>
-<body>
-  <p>This document is aimed at getting new users started as
-  quickly as possible. It contais almost no discussion about
-  why you do something, it just tells you what to do. See
-  other documentation for discussion of why things need to
-  be done this way.</p>
-  
-  <h1>Building</h1>
-  
-  <p>To build forrest2 you must first install:</p>
-  
-  <ul>
-    <li>ANT 1.6+</li>
-    <li>Java 1.5+</li>
-  </ul>
-  
-  <p class="step">
-    Run the command <span class="source">cd [FORREST2_HOME]</span>
-  </p>
-  
-  <p class="step">
-    Run the command <span class="source">ant compile-core</span>
-  </p>
-  
-  <h1>Running from the Command Line</h1>
-  
-  <p class="step">
-    Run the command <span class="source">cd [FORREST2_HOME]</span><br/>
-    Where [FORREST2_HOME] is the path to your Forrest2 core directory.
-  </p>
-      
-  <p class="step">ant -Dcontent.object.dir=[CONTENT_DIR] -Dcontent.object.start.uri=[REQUEST_URI] run<br/>
-  Where [CONTENT_DIR] is the directory containing the Forrest2 Content Object you wish
-  to work with and [REQUEST_URI] is the URI you wish to request</p>  
-  
-  <p class="note">There are some example content objects in
-  <span class="source">src/examples</span> for you to try out, for example:
-  ant -Dcontent.object.dir=[FORREST2_HOME]/src/examples/helloWorld -Dcontent.object.start.uri=helloWorld.html run</p>
-  
-  
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Getting Started</title>
+</head>
+<body>
+  <p>This document is aimed at getting new users started as
+  quickly as possible. It contais almost no discussion about
+  why you do something, it just tells you what to do. See
+  other documentation for discussion of why things need to
+  be done this way.</p>
+  
+  <h1>Building</h1>
+  
+  <p>To build forrest2 you must first install:</p>
+  
+  <ul>
+    <li>ANT 1.6+</li>
+    <li>Java 1.5+</li>
+  </ul>
+  
+  <p class="step">
+    Run the command <span class="source">cd [FORREST2_HOME]</span>
+  </p>
+  
+  <p class="step">
+    Run the command <span class="source">ant compile-core</span>
+  </p>
+  
+  <h1>Running from the Command Line</h1>
+  
+  <p class="step">
+    Run the command <span class="source">cd [FORREST2_HOME]</span><br/>
+    Where [FORREST2_HOME] is the path to your Forrest2 core directory.
+  </p>
+      
+  <p class="step">ant -Dcontent.object.dir=[CONTENT_DIR] -Dcontent.object.start.uri=[REQUEST_URI] run<br/>
+  Where [CONTENT_DIR] is the directory containing the Forrest2 Content Object you wish
+  to work with and [REQUEST_URI] is the URI you wish to request</p>  
+  
+  <p class="note">There are some example content objects in
+  <span class="source">src/examples</span> for you to try out, for example:
+  ant -Dcontent.object.dir=[FORREST2_HOME]/src/examples/helloWorld -Dcontent.object.start.uri=helloWorld.html run</p>
+  
+  
+</body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/docs/gettingStarted.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/rt/documentFactory.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/rt/documentFactory.html?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/rt/documentFactory.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/rt/documentFactory.html Tue Feb 20 20:37:51 2007
@@ -1,122 +1,122 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Document Factory</title>
-</head>
-<body>
-  <p>The org.apache.forrest.core.document.DocumentFactory
-  class is responsible for providing the type of document
-  when a reader has retrieved it from the source URL.
-  Clearly, there is an unlimited number of potential
-  document types that Forrest can process. It is therefore
-  necessary to be able to configure the DocumentFactory 
-  without touching the Java code. This document describes how
-  this configuration is performed.</p>
-  
-  <h1>A First Example</h1>
-  
-  <source><![CDATA[
-  <type id="org.apache.forrest.image.jpgeg"/>
-    <mime-type id="image/jpeg"/>
-  </type>
-  ]]></source>
-  
-  <h1>A Valid XML Exmple</h1>
-  
-  <p>Using the mime tyoe works well where the mime-type 
-  uniquely identifies the document type, however, this is
-  not always the case. For example, an XML document is
-  always identified by the mime-type "application/xml".
-  We therefore need a way of identifying the specific 
-  document type in such cases.</p>
-  
-  <p>For XML documents we are often provided with a reference
-  to a DTD that defines the XML document type. We can use this
-  information to define the document type within Forrest. For
-  example:</p>
-     
-  <source><![CDATA[
-  <type id="org.apache.forrest.xdoc2"/>
-    <mime-type id="application/xml"/>
-    <public-id="http://forrest.apache.org/dtd/document-v20.dtd"/>
-  </type>
-  ]]></source>
-  
-  <p>The above definition says that when an XML document is
-  discovered we should look to see if there is a reference
-  to a DTD with the public ID of 
-  "-//APACHE//DTD Documentation V2.0//EN".
-  If there is such a reference in a doctype definition then
-  we have identified the XML document type with the ID
-  "org.apache.forrest.xdoc2".</p>
-  
-  <h1>A XML Exmple (no DTD)</h1>
-  
-  <p>Using the Doctype definition is fine if the document is
-  well formed, but it is not a requirement for an XML document
-  to be well formed. We therefore need a way of identifying
-  a document type when the XML source does not contain a DTD.</p>
-  
-  <p>Unfortunately, there is no guarenteed method for
-  identifying such an XML document. The best we can do is
-  look at the struture of the document and infer the
-  type from what we find. For example:</p>
-    
-  <source><![CDATA[
-  <type id="org.foo.bar"/>
-    <mime-type id="application/xml"/>
-    <root>
-      <name>rootElement</name>
-    </root>
-  </type>
-  ]]></source>
-  
-  <p>This definition simply looks at the root element of
-  the document and, if a match is found then we have identified
-  the document type. Clearly, this could result in false matches
-  where two document types have the same root element. We
-  therefore need a way of further refining the document structure
-  definition. For example:</p>
-  
-  <source><![CDATA[
-  <type id="org.foo.bar"/>
-    <mime-type id="application/xml"/>
-    <root>
-      <name>root</name>
-      <attribute name="id"/>
-      <attribute name="url"/>
-    </root>
-  </type>
-  ]]></source>
-  
-  <p>This definition expects to see a root element called
-  "root" with  an "id" and a "url" attibute.</p>
-  
-  <p>A different refinement would be:</p>
-  
-  <source><![CDATA[
-  <type id="org.foo.bar"/>
-    <mime-type id="application/xml"/>
-    <root>
-      <name>root</name>
-      <children>
-        <element>
-          <name>child1</name>
-        </element>
-        <element>
-          <name>child2</name>
-          <attribute name="colour"/>
-        </element>
-      </children>
-    </root>
-  </type>
-  ]]></source>
-  
-  <p>This definition expects a root element with the name
-  "root" and two child elements named "child1" and "child2".
-  These elements need not be in this order, but they must
-  both be present. The "child2" element must have an id
-  with the name "colour".</p>
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Document Factory</title>
+</head>
+<body>
+  <p>The org.apache.forrest.core.document.DocumentFactory
+  class is responsible for providing the type of document
+  when a reader has retrieved it from the source URL.
+  Clearly, there is an unlimited number of potential
+  document types that Forrest can process. It is therefore
+  necessary to be able to configure the DocumentFactory 
+  without touching the Java code. This document describes how
+  this configuration is performed.</p>
+  
+  <h1>A First Example</h1>
+  
+  <source><![CDATA[
+  <type id="org.apache.forrest.image.jpgeg"/>
+    <mime-type id="image/jpeg"/>
+  </type>
+  ]]></source>
+  
+  <h1>A Valid XML Exmple</h1>
+  
+  <p>Using the mime tyoe works well where the mime-type 
+  uniquely identifies the document type, however, this is
+  not always the case. For example, an XML document is
+  always identified by the mime-type "application/xml".
+  We therefore need a way of identifying the specific 
+  document type in such cases.</p>
+  
+  <p>For XML documents we are often provided with a reference
+  to a DTD that defines the XML document type. We can use this
+  information to define the document type within Forrest. For
+  example:</p>
+     
+  <source><![CDATA[
+  <type id="org.apache.forrest.xdoc2"/>
+    <mime-type id="application/xml"/>
+    <public-id="http://forrest.apache.org/dtd/document-v20.dtd"/>
+  </type>
+  ]]></source>
+  
+  <p>The above definition says that when an XML document is
+  discovered we should look to see if there is a reference
+  to a DTD with the public ID of 
+  "-//APACHE//DTD Documentation V2.0//EN".
+  If there is such a reference in a doctype definition then
+  we have identified the XML document type with the ID
+  "org.apache.forrest.xdoc2".</p>
+  
+  <h1>A XML Exmple (no DTD)</h1>
+  
+  <p>Using the Doctype definition is fine if the document is
+  well formed, but it is not a requirement for an XML document
+  to be well formed. We therefore need a way of identifying
+  a document type when the XML source does not contain a DTD.</p>
+  
+  <p>Unfortunately, there is no guarenteed method for
+  identifying such an XML document. The best we can do is
+  look at the struture of the document and infer the
+  type from what we find. For example:</p>
+    
+  <source><![CDATA[
+  <type id="org.foo.bar"/>
+    <mime-type id="application/xml"/>
+    <root>
+      <name>rootElement</name>
+    </root>
+  </type>
+  ]]></source>
+  
+  <p>This definition simply looks at the root element of
+  the document and, if a match is found then we have identified
+  the document type. Clearly, this could result in false matches
+  where two document types have the same root element. We
+  therefore need a way of further refining the document structure
+  definition. For example:</p>
+  
+  <source><![CDATA[
+  <type id="org.foo.bar"/>
+    <mime-type id="application/xml"/>
+    <root>
+      <name>root</name>
+      <attribute name="id"/>
+      <attribute name="url"/>
+    </root>
+  </type>
+  ]]></source>
+  
+  <p>This definition expects to see a root element called
+  "root" with  an "id" and a "url" attibute.</p>
+  
+  <p>A different refinement would be:</p>
+  
+  <source><![CDATA[
+  <type id="org.foo.bar"/>
+    <mime-type id="application/xml"/>
+    <root>
+      <name>root</name>
+      <children>
+        <element>
+          <name>child1</name>
+        </element>
+        <element>
+          <name>child2</name>
+          <attribute name="colour"/>
+        </element>
+      </children>
+    </root>
+  </type>
+  ]]></source>
+  
+  <p>This definition expects a root element with the name
+  "root" and two child elements named "child1" and "child2".
+  These elements need not be in this order, but they must
+  both be present. The "child2" element must have an id
+  with the name "colour".</p>
+</body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/docs/rt/documentFactory.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/docs/sourceDocumentAggregation.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/docs/sourceDocumentAggregation.html?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/docs/sourceDocumentAggregation.html (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/docs/sourceDocumentAggregation.html Tue Feb 20 20:37:51 2007
@@ -1,30 +1,30 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Source Document Aggregation</title>
-</head>
-<body>
-
-<p>It is common to want to aggregate the contents of multiple 
-documents into a single source document. There are a number
-of ways of achieving this, such as XInclude or the document()
-method in XSLT. Forrest 2 provides its own aggregation 
-mechanism to augment such techniques.</p>
-
-<p>We can define an aggregation in the locationmap/xml file.
-For example:</p>
-
-<source><![CDATA[
-  <location regexp="(.*).html">
-    <aggregate>
-      <source href="classpath:/xdocs/navigation/$(1).xml"/>
-      <source href="classpath:/xdocs/navigation/site.xml"/>
-      <source href="classpath:/xdocs/$(1).xml" required="true"/>
-      <source href="classpath:/xdocs/$(1).metadata.xml"/>
-    </aggregate>
-  </location>
-]]></source>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Source Document Aggregation</title>
+</head>
+<body>
+
+<p>It is common to want to aggregate the contents of multiple 
+documents into a single source document. There are a number
+of ways of achieving this, such as XInclude or the document()
+method in XSLT. Forrest 2 provides its own aggregation 
+mechanism to augment such techniques.</p>
+
+<p>We can define an aggregation in the locationmap/xml file.
+For example:</p>
+
+<source><![CDATA[
+  <location regexp="(.*).html">
+    <aggregate>
+      <source href="classpath:/xdocs/navigation/$(1).xml"/>
+      <source href="classpath:/xdocs/navigation/site.xml"/>
+      <source href="classpath:/xdocs/$(1).xml" required="true"/>
+      <source href="classpath:/xdocs/$(1).metadata.xml"/>
+    </aggregate>
+  </location>
+]]></source>
+
+</body>
+</html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/docs/sourceDocumentAggregation.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2 Tue Feb 20 20:37:51 2007
@@ -1,15 +1,15 @@
-<?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> 
-    <title>XHTML 2 Bonjour Monde</title>
-  </head> 
-  <body> 
-    <h>Bonjour Monde</h>
-    
-    <a href="helloWorld.html">English</a>
-  </body>
+<?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> 
+    <title>XHTML 2 Bonjour Monde</title>
+  </head> 
+  <body> 
+    <h>Bonjour Monde</h>
+    
+    <a href="helloWorld.html">English</a>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 2007
@@ -1,15 +1,15 @@
-<?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> 
-    <title>XHTML 2 Hello World</title>
-  </head> 
-  <body> 
-    <h>Hello World</h>
-    
-    <a href="bonjourMonde.html">French</a>
-  </body>
+<?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> 
+    <title>XHTML 2 Hello World</title>
+  </head> 
+  <body> 
+    <h>Hello World</h>
+    
+    <a href="bonjourMonde.html">French</a>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/helloWorld.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 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>    
-</ivy-module>
+<?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>    
+</ivy-module>

Propchange: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-collections/ivy-3.2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 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>
-</ivy-module>
+<?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>
+</ivy-module>

Propchange: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.0.4.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 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="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>
+<?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>    
+</ivy-module>

Propchange: forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-util/ivy-2.2.2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/.mymetadata
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/.mymetadata?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/.mymetadata (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/.mymetadata Tue Feb 20 20:37:51 2007
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project-module
   type="WEB"
   name="forrest2-webapp"
   id="myeclipse.1155856143913"
   context-root="/forrest2-webapp"
   j2ee-spec="1.4"
-  archive="forrest2-webapp.war">
-  <attributes>
-    <attribute name="webrootdir" value="WebRoot" />
-  </attributes>
-</project-module>
-
+  archive="forrest2-webapp.war">
+  <attributes>
+    <attribute name="webrootdir" value="WebRoot" />
+  </attributes>
+</project-module>
+

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/.mymetadata
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/META-INF/MANIFEST.MF?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/META-INF/MANIFEST.MF (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/META-INF/MANIFEST.MF Tue Feb 20 20:37:51 2007
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Class-Path: 
-
+Manifest-Version: 1.0
+Class-Path: 
+

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/org/apache/forrest/webapp/ForrestController.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/org/apache/forrest/webapp/ForrestController.java?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/org/apache/forrest/webapp/ForrestController.java (original)
+++ forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/org/apache/forrest/webapp/ForrestController.java Tue Feb 20 20:37:51 2007
@@ -1,135 +1,135 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.forrest.webapp;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.forrest.core.Controller;
-import org.apache.forrest.core.document.AbstractOutputDocument;
-import org.apache.forrest.core.exception.ProcessingException;
-import org.xml.sax.SAXException;
-
-public class ForrestController extends HttpServlet {
-	
-	static Controller controller;
-
-	/**
-	 * Constructor of the object.
-	 */
-	public ForrestController() {
-		super();
-		try {
-			controller = new Controller();
-		} catch (URISyntaxException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Destruction of the servlet. <br>
-	 */
-	public void destroy() {
-		super.destroy();
-	}
-
-	/**
-	 * The doGet method of the servlet. <br>
-	 *
-	 * This method is called when a form has its tag value method equals to get.
-	 * 
-	 * @param request the request send by the client to the server
-	 * @param response the response send by the server to the client
-	 * @throws ServletException if an error occurred
-	 * @throws IOException if an error occurred
-	 */
-	public void doGet(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-
-		response.setContentType("text/html");
-		PrintWriter out = response.getWriter();
-		URI requestURI;
-		try {
-			requestURI = new URI(request.getContextPath());
-			AbstractOutputDocument doc;
-			try {
-				doc = controller.getOutputDocument(requestURI);
-			} catch (ProcessingException e) {
-				throw new ServletException(e);
-			}
-			out.println(doc.getContentAsString());
-		} catch (URISyntaxException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		out.flush();
-		out.close();
-	}
-
-	/**
-	 * The doPost method of the servlet. <br>
-	 *
-	 * This method is called when a form has its tag value method equals to post.
-	 * 
-	 * @param request the request send by the client to the server
-	 * @param response the response send by the server to the client
-	 * @throws ServletException if an error occurred
-	 * @throws IOException if an error occurred
-	 */
-	public void doPost(HttpServletRequest request, HttpServletResponse response)
-			throws ServletException, IOException {
-
-		response.setContentType("text/html");
-		PrintWriter out = response.getWriter();
-		out
-				.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">");
-		out.println("<HTML>");
-		out.println("  <HEAD><TITLE>A Servlet</TITLE></HEAD>");
-		out.println("  <BODY>");
-		out.print("    This is ");
-		out.print(this.getClass());
-		out.println(", using the POST method");
-		out.println("  </BODY>");
-		out.println("</HTML>");
-		out.flush();
-		out.close();
-	}
-
-	/**
-	 * Initialization of the servlet. <br>
-	 *
-	 * @throws ServletException if an error occure
-	 */
-	public void init() throws ServletException {
-		// Put your code here
-	}
-
-}
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.forrest.webapp;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.forrest.core.Controller;
+import org.apache.forrest.core.document.AbstractOutputDocument;
+import org.apache.forrest.core.exception.ProcessingException;
+import org.xml.sax.SAXException;
+
+public class ForrestController extends HttpServlet {
+	
+	static Controller controller;
+
+	/**
+	 * Constructor of the object.
+	 */
+	public ForrestController() {
+		super();
+		try {
+			controller = new Controller();
+		} catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Destruction of the servlet. <br>
+	 */
+	public void destroy() {
+		super.destroy();
+	}
+
+	/**
+	 * The doGet method of the servlet. <br>
+	 *
+	 * This method is called when a form has its tag value method equals to get.
+	 * 
+	 * @param request the request send by the client to the server
+	 * @param response the response send by the server to the client
+	 * @throws ServletException if an error occurred
+	 * @throws IOException if an error occurred
+	 */
+	public void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+
+		response.setContentType("text/html");
+		PrintWriter out = response.getWriter();
+		URI requestURI;
+		try {
+			requestURI = new URI(request.getContextPath());
+			AbstractOutputDocument doc;
+			try {
+				doc = controller.getOutputDocument(requestURI);
+			} catch (ProcessingException e) {
+				throw new ServletException(e);
+			}
+			out.println(doc.getContentAsString());
+		} catch (URISyntaxException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		out.flush();
+		out.close();
+	}
+
+	/**
+	 * The doPost method of the servlet. <br>
+	 *
+	 * This method is called when a form has its tag value method equals to post.
+	 * 
+	 * @param request the request send by the client to the server
+	 * @param response the response send by the server to the client
+	 * @throws ServletException if an error occurred
+	 * @throws IOException if an error occurred
+	 */
+	public void doPost(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+
+		response.setContentType("text/html");
+		PrintWriter out = response.getWriter();
+		out
+				.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">");
+		out.println("<HTML>");
+		out.println("  <HEAD><TITLE>A Servlet</TITLE></HEAD>");
+		out.println("  <BODY>");
+		out.print("    This is ");
+		out.print(this.getClass());
+		out.println(", using the POST method");
+		out.println("  </BODY>");
+		out.println("</HTML>");
+		out.flush();
+		out.close();
+	}
+
+	/**
+	 * Initialization of the servlet. <br>
+	 *
+	 * @throws ServletException if an error occure
+	 */
+	public void init() throws ServletException {
+		// Put your code here
+	}
+
+}

Propchange: forrest/trunk/whiteboard/forrest2/forrest2-webapp/src/org/apache/forrest/webapp/ForrestController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/.settings/org.jayasoft.ivyde.eclipse.prefs
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/.settings/org.jayasoft.ivyde.eclipse.prefs?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/.settings/org.jayasoft.ivyde.eclipse.prefs (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/.settings/org.jayasoft.ivyde.eclipse.prefs Tue Feb 20 20:37:51 2007
@@ -1,5 +1,5 @@
-#Sat Dec 02 22:42:36 GMT 2006
-acceptedTypes=[inherited]
-eclipse.preferences.version=1
-ivy_conf_path=inherited
-retreive.pattern=none
+#Sat Dec 02 22:42:36 GMT 2006
+acceptedTypes=[inherited]
+eclipse.preferences.version=1
+ivy_conf_path=inherited
+retreive.pattern=none

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/.settings/org.jayasoft.ivyde.eclipse.prefs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/.wicketprops
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/.wicketprops?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/.wicketprops (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/.wicketprops Tue Feb 20 20:37:51 2007
@@ -1,2 +1,2 @@
-#Fri Dec 08 23:23:39 GMT 2006
-web.cssPaths=layout.css,nav.css
+#Fri Dec 08 23:23:39 GMT 2006
+web.cssPaths=layout.css,nav.css

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/.wicketprops
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css Tue Feb 20 20:37:51 2007
@@ -1,19 +1,19 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 html, body {
    margin: 0;
    padding: 0;

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2 Tue Feb 20 20:37:51 2007
@@ -1,22 +1,22 @@
-<?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> 
-    <title>Forrest2 and Wicket Integration Example</title>
-  </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>
-    <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>
+<?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> 
+    <title>Forrest2 and Wicket Integration Example</title>
+  </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>
+    <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>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2 Tue Feb 20 20:37:51 2007
@@ -1,15 +1,15 @@
-<?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> 
-    <title>File Not Found</title>
-  </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>
-  </body>
+<?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> 
+    <title>File Not Found</title>
+  </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>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 2007
@@ -1,13 +1,13 @@
-<?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> 
-    <title>Footer</title>
-  </head> 
-  <body> 
-    <h>Default Footer</h>
-  </body>
+<?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> 
+    <title>Footer</title>
+  </head> 
+  <body> 
+    <h>Default Footer</h>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/default.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 2007
@@ -1,13 +1,13 @@
-<?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> 
-    <title>Footer</title>
-  </head> 
-  <body> 
-    <h>Footer</h>
-  </body>
+<?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> 
+    <title>Footer</title>
+  </head> 
+  <body> 
+    <h>Footer</h>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/index.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 2007
@@ -1,13 +1,13 @@
-<?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> 
-    <title>Header</title>
-  </head> 
-  <body> 
-    <h>Default Header</h>
-  </body>
+<?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> 
+    <title>Header</title>
+  </head> 
+  <body> 
+    <h>Default Header</h>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/default.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- 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 Tue Feb 20 20:37:51 2007
@@ -1,13 +1,13 @@
-<?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> 
-    <title>Header</title>
-  </head> 
-  <body> 
-    <h>Header</h>
-  </body>
+<?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> 
+    <title>Header</title>
+  </head> 
+  <body> 
+    <h>Header</h>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/index.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2 Tue Feb 20 20:37:51 2007
@@ -1,15 +1,15 @@
-<?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> 
-    <title>Subdir Index</title>
-  </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>
-  </body>
+<?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> 
+    <title>Subdir Index</title>
+  </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>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

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=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2 Tue Feb 20 20:37:51 2007
@@ -1,15 +1,15 @@
-<?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> 
-    <title>Subdirectory File Not Found</title>
-  </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>
-  </body>
+<?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> 
+    <title>Subdirectory File Not Found</title>
+  </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>
+  </body>
 </html>

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft?view=diff&rev=509889&r1=509888&r2=509889
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft Tue Feb 20 20:37:51 2007
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<forrest:contract 
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="apache-ssi">
-  
-  <description>
-    apache-ssi will output a ssi include link for the Apache webserver.
-    You can either use "virtual" or "file" includes. Will output something like:
-    <![CDATA[<!--#include virtual="file.html" -->]]>
-  </description>
-  <usage><![CDATA[<forrest:contract name="apache-ssi">
-  <forrest:property name="includeType">virtual|file</forrest:property>
-  <forrest:property name="includePath">index.html</forrest:property>
-</forrest:contract>]]></usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="apache-ssi" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-		<xsl:param name="includeType" select="'virtual|file'"/>
-		<xsl:param name="includePath" select="'../index.html'"/>
-      <xsl:template match="/">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<forrest:contract 
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="apache-ssi">
+  
+  <description>
+    apache-ssi will output a ssi include link for the Apache webserver.
+    You can either use "virtual" or "file" includes. Will output something like:
+    <![CDATA[<!--#include virtual="file.html" -->]]>
+  </description>
+  <usage><![CDATA[<forrest:contract name="apache-ssi">
+  <forrest:property name="includeType">virtual|file</forrest:property>
+  <forrest:property name="includePath">index.html</forrest:property>
+</forrest:contract>]]></usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    name="apache-ssi" inputFormat="xsl">
+    <xsl:stylesheet version="1.1" 
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+		<xsl:param name="includeType" select="'virtual|file'"/>
+		<xsl:param name="includePath" select="'../index.html'"/>
+      <xsl:template match="/">
         <forrest:content>
           <forrest:part>
             <xsl:variable name="output"> #include
@@ -53,8 +53,8 @@
                 select="normalize-space($output)"/>
             </xsl:comment>
           </forrest:part>
-        </forrest:content>
-      </xsl:template>
-    </xsl:stylesheet>
-  </forrest:template>
+        </forrest:content>
+      </xsl:template>
+    </xsl:stylesheet>
+  </forrest:template>
 </forrest:contract>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message