Author: crossley
Date: Mon Apr 9 23:05:03 2007
New Revision: 527041
URL: http://svn.apache.org/viewvc?view=rev&rev=527041
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644
Modified:
forrest/trunk/whiteboard/forrest2/core/build.xml
forrest/trunk/whiteboard/forrest2/core/ivy.xml
forrest/trunk/whiteboard/forrest2/core/ivyconf.xml
forrest/trunk/whiteboard/forrest2/core/src/conf/defaultForrestContext.xml
forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/core/xdocs/samples/xslt/internal-to-html.xsl
forrest/trunk/whiteboard/forrest2/core/src/docs/createAPlugin.html
forrest/trunk/whiteboard/forrest2/core/src/docs/readme.html
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/forrestContext.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/xdocs/exampleFeed.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/affiliateProductCatalogue/src/xslt/tradeDoublerFeed-to-internal.xsl
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/forrestContext.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/resources/xslt/site-to-internal.xsl
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/resources/xslt/xdoc2-to-internal.xsl
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/index.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/ascii-art.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/customSchema.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/demo-i18n.de.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/demo-i18n.fr.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/demo-i18n.nl.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/demo-i18n.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/faq.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/i18n.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/index.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/linking.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/sample.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/static.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/book-sample.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/index.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/svg.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/usemap.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/xml-entities.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/site.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/tabs.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/forrestContext.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2
forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/helloWorld.xhtml2
forrest/trunk/whiteboard/forrest2/core/src/test/forrestContext.xml
forrest/trunk/whiteboard/forrest2/core/src/test/locationmap.xml
forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/sample_simple.html
forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xhtml2/second_sample.html
forrest/trunk/whiteboard/forrest2/core/src/test/xdocs/samples/xml/helloWorld.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-codec/ivy-1.3.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-collections/ivy-3.2.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-dbcp/ivy-1.2.1.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-httpclient/ivy-3.1-alpha1.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.0.4.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-logging/ivy-1.1.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/commons-pool/ivy-1.3.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/log4j/ivy-1.2.14.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/apache/xerces/ivy-2.5.0.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-commons/ivy-2.2.2.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm-util/ivy-2.2.2.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/asm/asm/ivy-2.2.2.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/cglib/cglib-nodep/ivy-2.1_3.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/jtidy/jtidy/ivy-4aug2000r7-dev.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/junit/junit/ivy-4.1.xml
forrest/trunk/whiteboard/forrest2/core/tools/ivy/repository/springframework/springframework/ivy-2.0.xml
forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/WEB-INF/web.xml
forrest/trunk/whiteboard/forrest2/forrest2-webapp/WebRoot/jettyconf.xml
forrest/trunk/whiteboard/forrest2/forrest2-webapp/build.xml
forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivy.xml
forrest/trunk/whiteboard/forrest2/forrest2-webapp/ivyconf.xml
forrest/trunk/whiteboard/forrest2/wicket-demo/src/forrestContext.xml
forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/BasePage.html
forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/Home.html
forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html
forrest/trunk/whiteboard/forrest2/wicket-demo/src/locationmap.xml
forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/WEB-INF/web.xml
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/index.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/notFound.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/default.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/footer/index.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/default.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/panel/header/index.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/index.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/navigation.xml
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/subdir/notFound.xhtml2
forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl
Modified: forrest/trunk/whiteboard/forrest2/core/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/build.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/build.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/build.xml Mon Apr 9 23:05:03 2007
@@ -16,132 +16,108 @@
limitations under the License.
-->
<project xmlns:ivy="antlib:fr.jayasoft.ivy.ant" name="forrest2"
default="compile-core">
-
- <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="content.object.dir" location="src/examples/helloWorld"/>
- <property name="content.object.start.uri" value="helloWorld.html"/>
- <property name="content.object.src.dir"
location="${content.object.dir}/src"/>
- <property name="content.object.build.dir"
location="${content.object.dir}/build"/>
-
- <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="content.object.dir" location="src/examples/helloWorld"/>
+ <property name="content.object.start.uri" value="helloWorld.html"/>
+ <property name="content.object.src.dir"
location="${content.object.dir}/src"/>
+ <property name="content.object.build.dir"
location="${content.object.dir}/build"/>
+ <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}" />
- <delete dir="${content.object.build.dir}" />
- </target>
-
- <target name="init" depends="clean">
- <mkdir dir="${project.build.classes.dir}" />
- <mkdir dir="${project.dist.dir}" />
- <mkdir dir="${project.dist.dir}/lib" />
- <mkdir dir="${content.object.build.dir}"/>
- <ivy:cachepath pathid="lib.path.id" conf="default" />
- </target>
-
- <target name="copy-core-resources" depends="init">
- <copy todir="${project.build.classes.dir}">
- <fileset dir="${project.core.src.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <target name="copy-test-resources" depends="init">
- <copy todir="${project.build.classes.dir}">
- <fileset dir="${project.core.test.src.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <target name="copy-content-object-resources" depends="init">
- <!-- <copy todir="${project.build.classes.dir}"> -->
- <copy todir="${content.object.build.dir}">
- <fileset dir="${content.object.src.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <target name="compile-core" depends="copy-core-resources">
- <javac destdir="${project.build.classes.dir}"
debug="${compile.debug}" classpathref="lib.path.id">
- <src path="${project.core.src.dir}" />
- </javac>
- </target>
-
- <target name="compile-content-object" depends="compile-core,
copy-content-object-resources">
- <javac destdir="${content.object.build.dir}"
debug="${compile.debug}">
- <classpath>
- <path refid="lib.path.id"/>
- <pathelement path="${project.build.classes.dir}"/>
- </classpath>
- <src path="${content.object.src.dir}" />
- </javac>
- </target>
-
- <target name="compile-core-tests" depends="compile-core,
copy-test-resources">
- <javac destdir="${project.build.classes.dir}"
debug="${compile.debug}" classpathref="lib.path.id">
- <src path="${project.core.test.src.dir}" />
- </javac>
- </target>
-
- <!-- =================================
+ <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}" />
+ <delete dir="${content.object.build.dir}" />
+ </target>
+ <target name="init" depends="clean">
+ <mkdir dir="${project.build.classes.dir}" />
+ <mkdir dir="${project.dist.dir}" />
+ <mkdir dir="${project.dist.dir}/lib" />
+ <mkdir dir="${content.object.build.dir}"/>
+ <ivy:cachepath pathid="lib.path.id" conf="default" />
+ </target>
+ <target name="copy-core-resources" depends="init">
+ <copy todir="${project.build.classes.dir}">
+ <fileset dir="${project.core.src.dir}">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="copy-test-resources" depends="init">
+ <copy todir="${project.build.classes.dir}">
+ <fileset dir="${project.core.test.src.dir}">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="copy-content-object-resources" depends="init">
+<!-- <copy todir="${project.build.classes.dir}"> -->
+ <copy todir="${content.object.build.dir}">
+ <fileset dir="${content.object.src.dir}">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+ <target name="compile-core" depends="copy-core-resources">
+ <javac destdir="${project.build.classes.dir}" debug="${compile.debug}"
classpathref="lib.path.id">
+ <src path="${project.core.src.dir}" />
+ </javac>
+ </target>
+ <target name="compile-content-object" depends="compile-core,
copy-content-object-resources">
+ <javac destdir="${content.object.build.dir}" debug="${compile.debug}">
+ <classpath>
+ <path refid="lib.path.id"/>
+ <pathelement path="${project.build.classes.dir}"/>
+ </classpath>
+ <src path="${content.object.src.dir}" />
+ </javac>
+ </target>
+ <target name="compile-core-tests" depends="compile-core,
copy-test-resources">
+ <javac destdir="${project.build.classes.dir}" debug="${compile.debug}"
classpathref="lib.path.id">
+ <src path="${project.core.test.src.dir}" />
+ </javac>
+ </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="${project.dist.dir}/lib/[artifact]-[revision].[ext]"
pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
- </target>
-
- <target name="run" depends="compile-content-object">
- <java classname="org.apache.forrest.cli.CLI"
+ <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="${project.dist.dir}/lib/[artifact]-[revision].[ext]"
pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
+ </target>
+ <target name="run" depends="compile-content-object">
+ <java classname="org.apache.forrest.cli.CLI"
dir="${content.object.dir}" fork="yes"
failonerror="yes">
- <classpath>
- <path refid="lib.path.id" />
- <pathelement
path="${project.build.classes.dir}"/>
- <pathelement path="${content.object.build.dir}"/>
- </classpath>
- <arg line="${content.object.start.uri}"/>
- </java>
- </target>
-
+ <classpath>
+ <path refid="lib.path.id" />
+ <pathelement path="${project.build.classes.dir}"/>
+ <pathelement path="${content.object.build.dir}"/>
+ </classpath>
+ <arg line="${content.object.start.uri}"/>
+ </java>
+ </target>
</project>
Modified: forrest/trunk/whiteboard/forrest2/core/ivy.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/ivy.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/ivy.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/ivy.xml Mon Apr 9 23:05:03 2007
@@ -16,26 +16,23 @@
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="1.1"/>
- <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="1.1"/>
+ <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/core/ivyconf.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/ivyconf.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/ivyconf.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/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,12 +27,11 @@
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"/>
@@ -41,4 +39,4 @@
<ibiblio name="ibiblio-maven2"/>
</chain>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivyconf>
Modified:
forrest/trunk/whiteboard/forrest2/core/src/conf/defaultForrestContext.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/conf/defaultForrestContext.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/conf/defaultForrestContext.xml
(original)
+++ forrest/trunk/whiteboard/forrest2/core/src/conf/defaultForrestContext.xml
Mon Apr 9 23:05:03 2007
@@ -16,29 +16,22 @@
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>
-
- <!-- ============================================= -->
- <!-- Input Plugins -->
- <!-- ============================================= -->
-
- <!-- ============================================= -->
- <!-- Output Plugins -->
- <!-- ============================================= -->
-
- <bean id="html"
+<beans>
+<!-- ============================================= -->
+<!-- Readers -->
+<!-- ============================================= -->
+ <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
+ <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
+<!-- ============================================= -->
+<!-- Input Plugins -->
+<!-- ============================================= -->
+<!-- ============================================= -->
+<!-- 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/conf/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/conf/locationmap.xml Mon Apr 9
23:05:03 2007
@@ -19,8 +19,7 @@
<location regexp="http://localhost:8888/xhtml/testPage.html";>
<source href="classpath:/xdocs/samples/xhtml2/sample_complete.html"/>
</location>
-
<location regexp="http://localhost:8888/test/helloWorld.html";>
<source href="classpath:/xdocs/samples/xml/helloWorld.xml"/>
</location>
-</locationmap>
\ No newline at end of file
+</locationmap>
