Author: crossley
Date: Mon Apr 9 22:46:08 2007
New Revision: 527039
URL: http://svn.apache.org/viewvc?view=rev&rev=527039
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644
Modified:
forrest/trunk/whiteboard/dispatcher/build.xml
forrest/trunk/whiteboard/dispatcher/targets/dispatch.xml
forrest/trunk/whiteboard/dispatcher/themes/contracts/m2.contract.xml
forrest/trunk/whiteboard/dispatcher/themes/contracts/master.contract.xml
forrest/trunk/whiteboard/dispatcher/themes/structurer/url/master.structurer.xml
Modified: forrest/trunk/whiteboard/dispatcher/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/build.xml?view=diff&rev=527039&r1=527038&r2=527039
==============================================================================
--- forrest/trunk/whiteboard/dispatcher/build.xml (original)
+++ forrest/trunk/whiteboard/dispatcher/build.xml Mon Apr 9 22:46:08 2007
@@ -16,54 +16,43 @@
limitations under the License.
-->
<project default="dispatcher.jar" basedir="." name="Dispatcher build file">
-
<description>
- Build system for Apache Forrest Dispatcher.
- Run the build script: build.bat or build.sh
+ Build system for Apache Forrest Dispatcher. Run the build script: build.bat
+ or build.sh
</description>
-
- <import file="targets/dispatch.xml"/>
- <target name="dispatcher.init">
+ <import file="targets/dispatch.xml"/>
+ <target name="dispatcher.init">
<tstamp>
<format property="YEAR" pattern="yyyy" locale="en"/>
</tstamp>
-
<property name="dispatcher.build.compiler.emacs" value="on"/>
<property name="dispatcher.build.compiler.warnings" value="true"/>
<property name="dispatcher.build.compiler.pedantic" value="false"/>
<property name="dispatcher.build.compiler.depend" value="true"/>
<property name="dispatcher.build.compiler.fulldepend" value="true"/>
- <property name="dispatcher.build.compiler.debug" value="on"/>
+ <property name="dispatcher.build.compiler.debug" value="on"/>
<property name="dispatcher.build.compiler.optimize" value="off"/>
<property name="dispatcher.build.compiler.deprecation" value="on"/>
- <property name="dispatcher.build.compiler.nowarn" value="on"/>
+ <property name="dispatcher.build.compiler.nowarn" value="on"/>
<property name="dispatcher.build.compiler.type" value="classic"/>
<property name="dispatcher.build.compiler.vm" value="1.5"/>
-
<property name="name" value="apache-dispatcher"/>
<property name="dispatcher.version" value="0.0.1-dev"/>
<property name="dispatcher.home" location="."/>
-
<property file="${dispatcher.home}/local.build.properties" />
<property file="${dispatcher.home}/build.properties" />
-
<property name="java.dir" location="java"/>
<property name="dispatcher.build.dir"
location="${dispatcher.home}/build"/>
<property name="dispatcher.build.docs"
location="${dispatcher.build.dir}/docs"/>
<property name="dispatcher.build.classes"
location="${dispatcher.build.dir}/classes"/>
<property name="dispatcher.lib.dir"
location="${dispatcher.home}/lib"/>
<property name="dispatcher.lib.api.dir"
location="${dispatcher.home}/lib/api"/>
-
<property name="dispatcher.ant.lib-dir"
location="${dispatcher.home}/tools/ant/lib"/>
<property name="dispatcher.anttasks"
location="${dispatcher.home}/tools/anttasks"/>
-
<property name="tools.jar"
location="${java.home}/../lib/tools.jar"/>
<available file="${tools.jar}" property="tools.jar.present"/>
-
<mkdir dir="${dispatcher.build.dir}"/>
-
<buildnumber file="${dispatcher.build.dir}/build.number"/>
-
<echo>
--------------------------------------------------------------
@@ -79,36 +68,31 @@
--------------------------------------------------------------
</echo>
-
<path id="dispatcher.classpath">
<fileset dir="${dispatcher.home}/lib" includes="**/*.jar"/>
<pathelement location="${tools.jar}"/>
</path>
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <fileset dir="${dispatcher.ant.lib-dir}" includes="ant-contrib-*.jar" />
- </classpath>
- </taskdef>
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <fileset dir="${dispatcher.ant.lib-dir}" includes="ant-contrib-*.jar"
/>
+ </classpath>
+ </taskdef>
</target>
-
<target name="dispatcher.clean" depends="dispatcher.init"
description="Delete all generated files">
<delete dir="${dispatcher.build.dir}"/>
</target>
-
<target name="dispatcher.clean-cache" depends="dispatcher.init"
description="Delete dispatcher cache dir.">
<echo>Deleting cache dir ${dispatcher.cache}</echo>
<delete dir="${dispatcher.cache}"/>
</target>
-
- <!-- =================================================================== -->
- <!-- Clean build, that is clean before build -->
- <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Clean build, that is clean before build -->
+<!-- =================================================================== -->
<target name="dispatcher.clean-build" depends="dispatcher.clean,
dispatcher.jar" description="Clean build, that is clean before build..." />
-
- <!-- =================================================================== -->
- <!-- Compile Dispatcher java classes
-->
- <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Compile Dispatcher java classes
-->
+<!-- =================================================================== -->
<target name="dispatcher.compile" depends="dispatcher.init">
<mkdir dir="${dispatcher.build.classes}"/>
<javac srcdir= "${java.dir}"
@@ -117,13 +101,11 @@
optimize= "${dispatcher.build.compiler.optimize}"
deprecation= "${dispatcher.build.compiler.deprecation}"
nowarn= "${dispatcher.build.compiler.nowarn}"
- classpathref= "dispatcher.classpath">
- </javac>
+ classpathref= "dispatcher.classpath"></javac>
</target>
-
<!-- =================================================================== -->
- <!-- Jar dispatcher classes
-->
- <!-- =================================================================== -->
+<!-- Jar dispatcher classes
-->
+<!-- =================================================================== -->
<target name="dispatcher.jar" depends="dispatcher.init, dispatcher.compile"
description="Generates the dispatcher jar.">
<jar
destfile="${dispatcher.build.dir}/dispatcher-${dispatcher.version}.jar"
basedir="${dispatcher.build.classes}">
@@ -131,7 +113,7 @@
<section name="org/apache/forrest/dispatcher/">
<attribute name="Comment" value="Support classes for Apache Forrest
Dispatcher"/>
<attribute name="Implementation-Title"
value="org.apache.forrest.dispatcher"/>
- <attribute name="Implementation-Version"
value="${dispatcher.version} ${TODAY}"/>
+ <attribute name="Implementation-Version"
value="${dispatcher.version} ${TODAY}"/>
<attribute name="Implementation-Vendor" value="The Apache Software
Foundation"/>
<attribute name="Implementation-URL"
value="http://forrest.apache.org/dipatcher/"/>
</section>
@@ -150,17 +132,17 @@
</target>
<target name="dispatcher.-prepare-classpath">
<path id="dispatcher.cp">
- <pathelement path="${env.CLASSPATH}" />
- <pathelement location="${dispatcher.build.classes}"/>
- <fileset dir="${dispatcher.lib.dir}" casesensitive="no">
- <include name="*.jar"/>
- <include name="*.zip"/>
- </fileset>
- <fileset dir="${dispatcher.lib.api.dir}" casesensitive="no">
- <include name="*.jar"/>
- <include name="*.zip"/>
- </fileset>
- <pathelement location="${tools.jar}"/>
+ <pathelement path="${env.CLASSPATH}" />
+ <pathelement location="${dispatcher.build.classes}"/>
+ <fileset dir="${dispatcher.lib.dir}" casesensitive="no">
+ <include name="*.jar"/>
+ <include name="*.zip"/>
+ </fileset>
+ <fileset dir="${dispatcher.lib.api.dir}" casesensitive="no">
+ <include name="*.jar"/>
+ <include name="*.zip"/>
+ </fileset>
+ <pathelement location="${tools.jar}"/>
</path>
</target>
</project>
Modified: forrest/trunk/whiteboard/dispatcher/targets/dispatch.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/targets/dispatch.xml?view=diff&rev=527039&r1=527038&r2=527039
==============================================================================
--- forrest/trunk/whiteboard/dispatcher/targets/dispatch.xml (original)
+++ forrest/trunk/whiteboard/dispatcher/targets/dispatch.xml Mon Apr 9
22:46:08 2007
@@ -15,38 +15,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<project default="dispatcher.dispatch" basedir="." name="dispatcher.dispatch">
-
- <!-- ===============================================================
+<!-- ===============================================================
Makes the dispatch.
param: location of log-file ${project.logkitfile}
===============================================================
-->
-
- <target name="dispatcher.dispatch" depends="dispatcher.init,
dispatcher.-prepare-classpath"
+ <target name="dispatcher.dispatch" depends="dispatcher.init,
dispatcher.-prepare-classpath"
description="Generates a static website for this
project">
-<dirname property="home" file="${dispatcher.home}/foo.xml"/>
- <echo>${home}</echo>
- <java classname="org.apache.forrest.dispatcher.Cli"
+ <dirname property="home" file="${dispatcher.home}/foo.xml"/>
+ <echo>${home}</echo>
+ <java classname="org.apache.forrest.dispatcher.Cli"
fork="true"
dir="${dispatcher.build.dir}"
maxmemory="${dispatcher.maxmemory}"
failonerror="false"
resultproperty="buildResult">
- <arg value="${home}"/>
- <jvmarg line="${dispatcher.jvmargs}"/>
- <classpath>
- <path refid="dispatcher.cp"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="dispatcher."/>
- <propertyref prefix="project."/>
- <propertyref name="user.home"/>
- <propertyref name="global.home"/>
- </syspropertyset>
- </java>
-
+ <arg value="${home}"/>
+ <jvmarg line="${dispatcher.jvmargs}"/>
+ <classpath>
+ <path refid="dispatcher.cp"/>
+ </classpath>
+ <syspropertyset>
+ <propertyref prefix="dispatcher."/>
+ <propertyref prefix="project."/>
+ <propertyref name="user.home"/>
+ <propertyref name="global.home"/>
+ </syspropertyset>
+ </java>
<if>
<equals arg1="${buildResult}" arg2="1"/>
<then>
@@ -58,13 +54,10 @@
</fail>
</then>
</if>
-
<echo>
-----------------------------
Static test page was successfully generated.
------------------------------
</echo>
</target>
-
-
</project>
Modified: forrest/trunk/whiteboard/dispatcher/themes/contracts/m2.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/themes/contracts/m2.contract.xml?view=diff&rev=527039&r1=527038&r2=527039
==============================================================================
--- forrest/trunk/whiteboard/dispatcher/themes/contracts/m2.contract.xml
(original)
+++ forrest/trunk/whiteboard/dispatcher/themes/contracts/m2.contract.xml Mon
Apr 9 22:46:08 2007
@@ -19,42 +19,44 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
xmlns:forrest="http://apache.org/forrest/templates/1.0";
name="m2">
-
- <!--NOTE:
+<!--NOTE:
THIS IS JUST AN EXPLANATION!!!-->
<description>
- <p> This is just a master contract, it will output something but *nothing*
in special. It should
- just serve to explain a wee bit contracts and what you can do with them.
- </p>
+ <p>
+ This is just a master contract, it will output something but *nothing* in
+ special. It should just serve to explain a wee bit contracts and what you
+ can do with them.
+ </p>
</description>
- <usage><![CDATA[<forrest:contract name="master"/>]]></usage>
+ <usage>
+<![CDATA[<forrest:contract name="master"/>]]>
+ </usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
name="m2" inputFormat="xsl">
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
- <!-- If you need default variables: -->
+<!-- If you need default variables: -->
<xsl:param name="test-inline" select="'test.html'"/>
- <!-- then extract the variable like: -->
- <!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>-->
-
- <xsl:template match="/">
- <!-- The dispatcher needs a well-formed xml document to work with.
+<!-- then extract the variable like: -->
+<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>-->
+ <xsl:template match="/">
+<!-- The dispatcher needs a well-formed xml document to work with.
The forrest:content element (as root element) can contain as many
forrest:part's as you want. -->
<forrest:content
xmlns:forrest="http://apache.org/forrest/templates/1.0";>
- <!-- forrest:part within this element the actual content is going
to.
+<!-- forrest:part within this element the actual content is going to.
If you use no @xpath then we insert content on the current
structurer position.-->
<forrest:part>
<h2>xXx</h2>
</forrest:part>
- <!--If you want to inject the content into a certain DOM position and
+<!--If you want to inject the content into a certain DOM position and
*not* the current position in the structurer, you can use the
@xpath attribute. -->
<forrest:part xpath="/html/head">
<title>dispatcher standalone</title>
</forrest:part>
</forrest:content>
</xsl:template>
- <!-- copy n paste -->
- <!--
+<!-- copy n paste -->
+<!--
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
<xsl:template match="/">
Modified:
forrest/trunk/whiteboard/dispatcher/themes/contracts/master.contract.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/themes/contracts/master.contract.xml?view=diff&rev=527039&r1=527038&r2=527039
==============================================================================
--- forrest/trunk/whiteboard/dispatcher/themes/contracts/master.contract.xml
(original)
+++ forrest/trunk/whiteboard/dispatcher/themes/contracts/master.contract.xml
Mon Apr 9 22:46:08 2007
@@ -19,39 +19,41 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
xmlns:forrest="http://apache.org/forrest/templates/1.0";
name="master">
-
- <!--NOTE:
+<!--NOTE:
THIS IS JUST AN EXPLANATION!!!-->
<description>
- <p> This is just a master contract, it will output something but *nothing*
in special. It should
- just serve to explain a wee bit contracts and what you can do with them.
- </p>
+ <p>
+ This is just a master contract, it will output something but *nothing* in
+ special. It should just serve to explain a wee bit contracts and what you
+ can do with them.
+ </p>
</description>
- <usage><![CDATA[<forrest:contract name="master"/>]]></usage>
+ <usage>
+<![CDATA[<forrest:contract name="master"/>]]>
+ </usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
name="master" inputFormat="xsl">
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:param name="test-inline" select="'test.html'"/>
-
- <xsl:template match="/">
- <!-- The dispatcher needs a well-formed xml document to work with.
+ <xsl:template match="/">
+<!-- The dispatcher needs a well-formed xml document to work with.
The forrest:content element (as root element) can contain as many
forrest:part's as you want. -->
<forrest:content
xmlns:forrest="http://apache.org/forrest/templates/1.0";>
- <!-- forrest:part within this element the actual content is going
to.
+<!-- forrest:part within this element the actual content is going to.
If you use no @xpath then we insert content on the current
structurer position.-->
<forrest:part>
Content going to the location defined by the structurer.
</forrest:part>
- <!--If you want to inject the content into a certain DOM position and
+<!--If you want to inject the content into a certain DOM position and
*not* the current position in the structurer, you can use the
@xpath attribute. -->
<forrest:part xpath="/html/head">
- <meta content=" Content going to a fixed location defined by the
contract (here: /html/head)." name="Description" />
+ <meta content=" Content going to a fixed location defined by the
contract (here: /html/head)." name="Description" />
</forrest:part>
</forrest:content>
</xsl:template>
- <!-- copy n paste -->
- <!--
+<!-- copy n paste -->
+<!--
<xsl:param name="defaultVariables" select="'test.html'"/>
<xsl:variable name="skin-img-dir" select="$defaultVariables/*/[EMAIL
PROTECTED]'skin-img-dir']/@value"/>
<xsl:template match="/">
Modified:
forrest/trunk/whiteboard/dispatcher/themes/structurer/url/master.structurer.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/themes/structurer/url/master.structurer.xml?view=diff&rev=527039&r1=527038&r2=527039
==============================================================================
---
forrest/trunk/whiteboard/dispatcher/themes/structurer/url/master.structurer.xml
(original)
+++
forrest/trunk/whiteboard/dispatcher/themes/structurer/url/master.structurer.xml
Mon Apr 9 22:46:08 2007
@@ -15,14 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<structur>
<structurer type="html" hooksXpath="/html/body">
<contract name="m2"/>
<contract name="master">
<property name="test-inline">
<css url="common.css"/>
- <!--<nupp/>-->
+<!--<nupp/>-->
</property>
<property name="test" value="test"/>
</contract>
