Author: crossley
Date: Sat Apr 7 00:46:45 2007
New Revision: 526391
URL: http://svn.apache.org/viewvc?view=rev&rev=526391
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644
Modified:
forrest/trunk/tools/forrestbot/avalon-phoenix.xml
forrest/trunk/tools/forrestbot/avalon-site.xml
forrest/trunk/tools/forrestbot/cocoon-site.xml
forrest/trunk/tools/forrestbot/core/build.xml
forrest/trunk/tools/forrestbot/core/deploy.xml
forrest/trunk/tools/forrestbot/core/forrestbot.xml
forrest/trunk/tools/forrestbot/core/getsrc.xml
forrest/trunk/tools/forrestbot/core/notify.xml
forrest/trunk/tools/forrestbot/forrest-pelt.xml
forrest/trunk/tools/forrestbot/forrest-seed.xml
forrest/trunk/tools/forrestbot/forrest.xml
forrest/trunk/tools/forrestbot/incubator.xml
forrest/trunk/tools/forrestbot/sf-struts.xml
forrest/trunk/tools/forrestbot/webapp/maven.xml
forrest/trunk/tools/forrestbot/webapp/project.xml
forrest/trunk/tools/forrestbot/webapp/src/conf/groups.xml
forrest/trunk/tools/forrestbot/webapp/src/conf/osuser.xml
forrest/trunk/tools/forrestbot/webapp/src/conf/projects.xml
forrest/trunk/tools/forrestbot/webapp/src/conf/users.xml
forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-config.xml
forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-tiles.xml
forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/web.xml
forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.html
forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.local.html
forrest/trunk/tools/forrestbot/ws-site.xml
forrest/trunk/tools/forrestbot/xml-fop.xml
forrest/trunk/tools/forrestbot/xml-site.xml
forrest/trunk/tools/forrestbot/xml-xindice.xml
forrest/trunk/tools/forrestbot/xml-xmlbeans.xml
Modified: forrest/trunk/tools/forrestbot/avalon-phoenix.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/avalon-phoenix.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/avalon-phoenix.xml (original)
+++ forrest/trunk/tools/forrestbot/avalon-phoenix.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="avalon-phoenix" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/avalon-site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/avalon-site.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/avalon-site.xml (original)
+++ forrest/trunk/tools/forrestbot/avalon-site.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="avalon-site" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/cocoon-site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/cocoon-site.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/cocoon-site.xml (original)
+++ forrest/trunk/tools/forrestbot/cocoon-site.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="cocoon-site" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/core/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/build.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/core/build.xml (original)
+++ forrest/trunk/tools/forrestbot/core/build.xml Sat Apr 7 00:46:45 2007
@@ -16,30 +16,24 @@
limitations under the License.
-->
<project name="build">
-
<property name="build.work-dir" location="work/${ant.project.name}"/>
<property name="build.site-dir"
location="build/${ant.project.name}"/>
<tstamp>
<format property="logtime" pattern="yyyyMMddHHmmss"/>
</tstamp>
-
<property name="build.log-dir" location="logs"/>
<mkdir dir="${build.log-dir}"/>
<property name="build.logfile"
location="${build.log-dir}/${ant.project.name}.log"/>
- <property name="build.logfile-stored"
location="${build.log-dir}/${ant.project.name}-${logtime}.log"/>
-
+ <property name="build.logfile-stored"
location="${build.log-dir}/${ant.project.name}-${logtime}.log"/>
<target name="build.forrest" depends="getsrc">
-
- <!-- defining this inside the target instead of at the top of the file
+<!-- defining this inside the target instead of at the top of the file
so that getsrc.local can override -->
- <property name="build.home-dir" location="${build.work-dir}" />
-
+ <property name="build.home-dir" location="${build.work-dir}" />
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="${bot.home}/lib/ant-contrib-0.5.jar"/>
</classpath>
</taskdef>
-
<trycatch property="errmsg" reference="exception">
<try>
<record name="${build.logfile}" action="start"/>
@@ -70,5 +64,4 @@
</trycatch>
<copy file="${build.logfile}" tofile="${build.logfile-stored}"/>
</target>
-
</project>
Modified: forrest/trunk/tools/forrestbot/core/deploy.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/deploy.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/core/deploy.xml (original)
+++ forrest/trunk/tools/forrestbot/core/deploy.xml Sat Apr 7 00:46:45 2007
@@ -16,12 +16,10 @@
limitations under the License.
-->
<project name="deploy">
-
- <!-- ================================================================= -->
- <!-- The deploy.local target -->
- <!-- ================================================================= -->
+<!-- ================================================================= -->
+<!-- The deploy.local target -->
+<!-- ================================================================= -->
<property name="deploy.local.dir" location="sites/${ant.project.name}"/>
-
<target name="deploy.local" unless="build.failed" description="FB: Deploy to
a local location">
<mkdir dir="${deploy.local.dir}"/>
<echo>Deploying from ${build.site-dir} to ${deploy.local.dir}</echo>
@@ -30,23 +28,19 @@
<modified/>
</fileset>
</copy>
-
- <!-- set a property to be used in the notify target -->
+<!-- set a property to be used in the notify target -->
<property name="notify.deploy-location" value="${deploy.local.dir}"/>
</target>
-
-
- <!-- ================================================================= -->
- <!-- The deploy.ftp target -->
- <!-- ================================================================= -->
+<!-- ================================================================= -->
+<!-- The deploy.ftp target -->
+<!-- ================================================================= -->
<property name="deploy.ftp.server" value="localhost"/>
<property name="deploy.ftp.user" value="anonymous"/>
<property name="deploy.ftp.password" value="forrestbot@"/>
<property name="deploy.ftp.remotedir" value="incoming"/>
<property name="deploy.ftp.verbose" value="yes"/>
<property name="deploy.ftp.newer" value="yes"/>
-
- <!-- target definition for deploy.ftp -->
+<!-- target definition for deploy.ftp -->
<target name="deploy.ftp" unless="build.failed" description="Forrestbot:
Deploy via FTP">
<ftp server="${deploy.ftp.server}" remotedir="${deploy.ftp.remotedir}"
@@ -57,10 +51,9 @@
</fileset>
</ftp>
</target>
-
- <!-- ================================================================= -->
- <!-- The deploy.scp target -->
- <!-- ================================================================= -->
+<!-- ================================================================= -->
+<!-- The deploy.scp target -->
+<!-- ================================================================= -->
<property name="deploy.scp.dest" value=""/>
<target name="deploy.scp" unless="build.failed" description="FB: Deploy to a
remote location via scp">
<if>
@@ -75,7 +68,9 @@
</target>
<target name="deploy.scp-with-keyfile">
<if>
- <not><isset property="deploy.scp.passphrase"/></not>
+ <not>
+ <isset property="deploy.scp.passphrase"/>
+ </not>
<then>
<input addproperty="deploy.scp.passphrase"
message="Enter local passphrase for key to enable scp to
${deploy.scp.dest}:"/>
@@ -90,7 +85,9 @@
</target>
<target name="deploy.scp-with-password">
<if>
- <not><isset property="deploy.scp.password"/></not>
+ <not>
+ <isset property="deploy.scp.password"/>
+ </not>
<then>
<input addproperty="deploy.scp.password"
message="Enter remote password to enable scp to
${deploy.scp.dest}:"/>
@@ -102,60 +99,54 @@
</fileset>
</scp>
</target>
-
- <!-- ================================================================= -->
- <!-- The deploy.cvs target -->
- <!-- ================================================================= -->
+<!-- ================================================================= -->
+<!-- The deploy.cvs target -->
+<!-- ================================================================= -->
<property name="deploy.cvs.user" value="anoncvs"/>
<property name="deploy.cvs.password" value="anoncvs"/>
<property name="deploy.cvs.root" value="/home/cvs"/>
<property name="deploy.cvs.host" value="cvs.apache.org"/>
<property name="deploy.cvs.module" value="${ant.project.name}"/>
<property name="deploy.cvs.commit-message" value="Automatic publish from
forrestbot"/>
-
<property name="deploy.cvsmodule-dir"
value="work/cvsmodules-deploy/${ant.project.name}"/>
-
<target name="deploy.cvs" unless="build.failed" description="FB: Deploy by
committing to a CVS repository">
<condition property="isUnix">
- <os family="unix"/>
+ <os family="unix"/>
</condition>
<fail unless="isUnix" message="deploy.cvs only supported for unix-like
operating systems."/>
-
<property name="deploy.cvs.fullroot" value=":ext:[EMAIL
PROTECTED]:${deploy.cvs.root}"/>
- <!-- log in -->
+<!-- log in -->
<cvspass cvsroot="${deploy.cvs.fullroot}"
password="${deploy.cvs.password}"/>
- <!-- get current CVS source -->
+<!-- get current CVS source -->
<cvs cvsRoot="${deploy.cvs.fullroot}"
package="${deploy.cvs.module}"
dest="${deploy.cvsmodule-dir}"
command="checkout"
failonerror="true"
/>
- <!-- copy new files into sandbox -->
+<!-- copy new files into sandbox -->
<copy todir="${deploy.cvsmodule-dir}/${deploy.cvs.module}">
<fileset dir="${build.site-dir}"/>
</copy>
- <!-- add new files to CVS -->
+<!-- add new files to CVS -->
<exec executable="${bot.home}/core/cvs_add.sh"
dir="${deploy.cvsmodule-dir}/${deploy.cvs.module}" failonerror="true"/>
- <!-- check in to CVS -->
+<!-- check in to CVS -->
<exec executable="cvs" dir="${deploy.cvsmodule-dir}/${deploy.cvs.module}"
failonerror="true">
<arg value="commit"/>
<arg value="-m '${deploy.cvs.commit-message}'"/>
</exec>
</target>
-
- <!-- ================================================================= -->
- <!-- The deploy.svn target -->
- <!-- ================================================================= -->
+<!-- ================================================================= -->
+<!-- The deploy.svn target -->
+<!-- ================================================================= -->
<property name="deploy.svn.user" value=""/>
<property name="deploy.svn.password" value=""/>
<property name="deploy.svn.url" value=""/>
<property name="deploy.svn.commit-message" value="Automatic publish from
forrestbot"/>
-
<property name="deploy.svn.svn-dir"
location="work/svn-deploy/${ant.project.name}"/>
<property name="deploy.svn.svn-filestoadd"
location="work/svn-deploy/${ant.project.name}.toadd"/>
<target name="deploy.svn" unless="build.failed" description="FB: Deploy by
committing to an SVN repository">
- <!-- get current SVN source -->
+<!-- get current SVN source -->
<svncheckout
repositoryurl="${deploy.svn.url}"
username="${deploy.svn.user}"
@@ -163,24 +154,22 @@
destination="${deploy.svn.svn-dir}"
failonerror="true"
/>
-
- <!-- copy new files into sandbox -->
+<!-- copy new files into sandbox -->
<copy todir="${deploy.svn.svn-dir}">
<fileset dir="${build.site-dir}"/>
</copy>
-
- <!-- add new files to SVN -->
- <!-- svnadd doesn't work (it doesn't change the working directory
properly) -->
+<!-- add new files to SVN -->
+<!-- svnadd doesn't work (it doesn't change the working directory properly) -->
<exec executable="svn" dir="${deploy.svn.svn-dir}"
output="${deploy.svn.svn-filestoadd}" failonerror="true">
<arg value="status"/>
</exec>
- <!-- the status columns make all lines invalid filenames
+<!-- the status columns make all lines invalid filenames
we remove the status columns for the new files so the only valid
filenames in the list are new files
-->
<replace file="${deploy.svn.svn-filestoadd}" token="? " value=""/>
<replace file="${deploy.svn.svn-filestoadd}" token="M " value=""/>
- <!-- don't fail on error here because
+<!-- don't fail on error here because
1) the targets file might have 'bad' filenames but we should continue
2) we would've already failed if the svn executable wasn't found
-->
@@ -189,12 +178,11 @@
<arg value="--targets"/>
<arg value="${deploy.svn.svn-filestoadd}"/>
</exec>
- <!-- check in to SVN -->
+<!-- check in to SVN -->
<svncommit
target="${deploy.svn.svn-dir}"
repositoryurl="${deploy.svn.url}"
commitmessage="${deploy.svn.commit-message}"
/>
-
</target>
</project>
Modified: forrest/trunk/tools/forrestbot/core/forrestbot.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/forrestbot.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/core/forrestbot.xml (original)
+++ forrest/trunk/tools/forrestbot/core/forrestbot.xml Sat Apr 7 00:46:45 2007
@@ -15,30 +15,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<project name="forrestbot" basedir="." default="main">
-
<property environment="ENV"/>
<property name="forrest.root-dir" location="${ENV.FORREST_HOME}"/>
<property name="bot.home" location="${forrest.root-dir}/tools/forrestbot"/>
-
<import file="${forrest.root-dir}/main/forrest.build.xml"/>
-
- <!-- include workstage implementations -->
+<!-- include workstage implementations -->
<import file="${bot.home}/core/getsrc.xml"/>
<import file="${bot.home}/core/build.xml"/>
<import file="${bot.home}/core/deploy.xml"/>
<import file="${bot.home}/core/notify.xml"/>
-
- <!-- default implmentations for each workstages -->
+<!-- default implmentations for each workstages -->
<target name="getsrc" depends="getsrc.clean-workdir, getsrc.cvs"
description="FB: Get source via getsrc.cvs"/>
-
<target name="build" depends="build.forrest" description="FB: Build via
`forrest site`"/>
-
<target name="deploy" depends="deploy.local" description="FB: Deploy via
deploy.local"/>
-
<target name="notify" depends="notify.local" description="FB: Notify via
notify.local"/>
-
<target name="clean">
<antcall target="forrest.clean" inheritAll="false">
<param name="project.home" value="${build.work-dir}"/>
@@ -46,8 +37,6 @@
<param name="project.site-dir" value="${build.site-dir}"/>
</antcall>
</target>
-
- <!-- run the workstages -->
+<!-- run the workstages -->
<target name="main" depends="getsrc, build, deploy, notify" description="FB:
getsrc, build, deploy, notify"/>
-
</project>
Modified: forrest/trunk/tools/forrestbot/core/getsrc.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/getsrc.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/core/getsrc.xml (original)
+++ forrest/trunk/tools/forrestbot/core/getsrc.xml Sat Apr 7 00:46:45 2007
@@ -16,42 +16,35 @@
limitations under the License.
-->
<project name="getsrc">
-
- <!-- default values -->
+<!-- default values -->
<property name="getsrc.local.root-dir" value=""/>
-
<target name="getsrc.clean-workdir">
- <delete dir="${build.work-dir}"/>
+ <delete dir="${build.work-dir}"/>
</target>
-
<target name="getsrc.local" description="FB: Get source from local
filesystem">
<property name="build.home-dir" location="${getsrc.local.root-dir}" />
</target>
-
- <!-- default values -->
+<!-- default values -->
<property name="getsrc.cvs.user" value="anoncvs"/>
<property name="getsrc.cvs.password" value="anoncvs"/>
<property name="getsrc.cvs.root" value="/home/cvspublic"/>
<property name="getsrc.cvs.host" value="cvs.apache.org"/>
<property name="getsrc.cvs.module" value="${ant.project.name}"/>
<property name="getsrc.cvs.tag" value=""/>
-
<property name="build.cvsmodule-dir" location="work/cvsmodules"/>
-
<target name="getsrc.cvs" description="FB: Get source from a CVS repository">
-
<cvspass cvsroot=":pserver:[EMAIL PROTECTED]:${getsrc.cvs.root}"
password="${getsrc.cvs.password}"/>
-
- <!-- non-recursive; just to get forrest.properties -->
- <echo><![CDATA[<cvs cvsRoot=":pserver:[EMAIL PROTECTED]:${getsrc.cvs.root}"
+<!-- non-recursive; just to get forrest.properties -->
+ <echo>
+<![CDATA[<cvs cvsRoot=":pserver:[EMAIL PROTECTED]:${getsrc.cvs.root}"
package="${getsrc.cvs.module}"
dest="${build.cvsmodule-dir}"
quiet="false"
command="checkout -l"
tag="${getsrc.cvs.tag}"
failonerror="true"
- />]]></echo>
-
+ />]]>
+ </echo>
<cvs cvsRoot=":pserver:[EMAIL PROTECTED]:${getsrc.cvs.root}"
package="${getsrc.cvs.module}"
dest="${build.cvsmodule-dir}"
@@ -60,20 +53,19 @@
tag="${getsrc.cvs.tag}"
failonerror="true"
/>
-
<echo>Loading
${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties..</echo>
<loadproperties
srcFile="${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties"/>
<loadproperties
srcFile="${forrest.home}/main/webapp/default-forrest.properties"/>
-
- <!-- only the project.content-dir directory -->
- <echo><![CDATA[<cvs cvsRoot=":pserver:[EMAIL PROTECTED]:${getsrc.cvs.root}"
+<!-- only the project.content-dir directory -->
+ <echo>
+<![CDATA[<cvs cvsRoot=":pserver:[EMAIL PROTECTED]:${getsrc.cvs.root}"
package="${getsrc.cvs.module}/${project.content-dir}"
dest="${build.cvsmodule-dir}"
quiet="false"
tag="${getsrc.cvs.tag}"
failonerror="true"
- />]]></echo>
-
+ />]]>
+ </echo>
<cvs cvsRoot=":pserver:[EMAIL PROTECTED]:${getsrc.cvs.root}"
package="${getsrc.cvs.module}/${project.content-dir}"
dest="${build.cvsmodule-dir}"
@@ -81,50 +73,39 @@
tag="${getsrc.cvs.tag}"
failonerror="true"
/>
-
<copy todir="${build.work-dir}" overwrite="true">
<fileset dir="${build.cvsmodule-dir}/${getsrc.cvs.module}"/>
</copy>
-
</target>
-
-
<taskdef resource="taskdef.properties">
<classpath>
- <!-- non-recursive doesn't work from 0.8 stable -->
+<!-- non-recursive doesn't work from 0.8 stable -->
<pathelement location="${bot.home}/lib/jsvn-0.9-dev.jar"/>
</classpath>
</taskdef>
-
- <!-- default values -->
+<!-- default values -->
<property name="getsrc.svn.url" value=""/>
<property name="getsrc.svn.revision" value="HEAD"/>
-
<property name="build.svn-dir" location="work/svn"/>
-
<target name="getsrc.svn" description="FB: Get source from an SVN
repository">
- <!-- non-recursive; just to get forrest.properties -->
- <echo>svn: ${getsrc.svn.url} ->
${build.svn-dir}/${ant.project.name}</echo>
+<!-- non-recursive; just to get forrest.properties -->
+ <echo>svn: ${getsrc.svn.url} -> ${build.svn-dir}/${ant.project.name}</echo>
<svncheckout repositoryUrl="${getsrc.svn.url}"
destination="${build.svn-dir}/${ant.project.name}"
revision="${getsrc.svn.revision}"
failonerror="true"
recursive="false"/>
-
<echo>Loading
${build.svn-dir}/${ant.project.name}/forrest.properties..</echo>
<loadproperties
srcFile="${build.svn-dir}/${ant.project.name}/forrest.properties"/>
<loadproperties
srcFile="${forrest.home}/main/webapp/default-forrest.properties"/>
-
- <!-- only the project.content-dir directory -->
- <echo>svn: ${getsrc.svn.url}/${project.content-dir} ->
${build.svn-dir}/${ant.project.name}/${project.content-dir}</echo>
+<!-- only the project.content-dir directory -->
+ <echo>svn: ${getsrc.svn.url}/${project.content-dir} ->
${build.svn-dir}/${ant.project.name}/${project.content-dir}</echo>
<svncheckout repositoryUrl="${getsrc.svn.url}/${project.content-dir}"
destination="${build.svn-dir}/${ant.project.name}/${project.content-dir}"
revision="${getsrc.svn.revision}"
failonerror="true"/>
-
<copy todir="${build.work-dir}" overwrite="true">
<fileset dir="${build.svn-dir}/${ant.project.name}"/>
</copy>
</target>
-
</project>
Modified: forrest/trunk/tools/forrestbot/core/notify.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/notify.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/core/notify.xml (original)
+++ forrest/trunk/tools/forrestbot/core/notify.xml Sat Apr 7 00:46:45 2007
@@ -16,38 +16,35 @@
limitations under the License.
-->
<project name="notify">
-
- <!-- default values -->
+<!-- default values -->
<property name="notify.administrator" value=""/>
<property name="notify.on.failure" value="true"/>
<property name="notify.on.success" value="true"/>
-
- <!-- set property defaults after other workstages have been run -->
+<!-- set property defaults after other workstages have been run -->
<target name="notify.init">
<property name="notify.log" value="${build.logfile-stored}"/>
<property name="notify.deploy-location" value=""/>
<property name="notify.completion-status" value="- workstage should have
set this -"/>
<if>
- <isset property="build.failed"/>
- <then>
- <if>
- <istrue value="${notify.on.failure}"/>
- <then>
- <property name="notify.do" value="true"/>
- </then>
- </if>
- </then>
- <else>
- <if>
- <istrue value="${notify.on.success}"/>
- <then>
- <property name="notify.do" value="true"/>
- </then>
- </if>
- </else>
+ <isset property="build.failed"/>
+ <then>
+ <if>
+ <istrue value="${notify.on.failure}"/>
+ <then>
+ <property name="notify.do" value="true"/>
+ </then>
+ </if>
+ </then>
+ <else>
+ <if>
+ <istrue value="${notify.on.success}"/>
+ <then>
+ <property name="notify.do" value="true"/>
+ </then>
+ </if>
+ </else>
</if>
</target>
-
<target name="notify.local" depends="build, notify.init" if="notify.do"
description="FB: Notify to the console">
<tstamp>
<format property="NOW" pattern="dd MMMM hh:mm aa"/>
@@ -63,13 +60,10 @@
----------------------------------
</echo>
</target>
-
-
- <!-- default values -->
+<!-- default values -->
<property name="notify.email.host" value="localhost"/>
<property name="notify.email.to" value="[EMAIL PROTECTED]"/>
<property name="notify.email.from" value="Forrestbot"/>
-
<target name="notify.email" depends="build, notify.init" if="notify.do"
description="FB: Notify by email">
<tstamp>
<format property="NOW" pattern="dd MMMM hh:mm aa"/>
@@ -84,5 +78,4 @@
encoding="plain"
/>
</target>
-
</project>
Modified: forrest/trunk/tools/forrestbot/forrest-pelt.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/forrest-pelt.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/forrest-pelt.xml (original)
+++ forrest/trunk/tools/forrestbot/forrest-pelt.xml Sat Apr 7 00:46:45 2007
@@ -16,14 +16,10 @@
limitations under the License.
-->
<project name="forrest-pelt" default="main">
-
- <property name="getsrc.svn.url"
value="http://svn.apache.org/repos/asf/forrest/trunk"/>
- <target name="getsrc" depends="getsrc.clean-workdir, getsrc.svn"/>
-
- <!-- any properties we set here will take precedence of the project's
forrest.properties -->
- <property name="project.skin" value="pelt"/>
- <property environment="env"/>
- <import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
+ <property name="getsrc.svn.url"
value="http://svn.apache.org/repos/asf/forrest/trunk"/>
+ <target name="getsrc" depends="getsrc.clean-workdir, getsrc.svn"/>
+<!-- any properties we set here will take precedence of the project's
forrest.properties -->
+ <property name="project.skin" value="pelt"/>
+ <property environment="env"/>
+ <import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
</project>
-
Modified: forrest/trunk/tools/forrestbot/forrest-seed.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/forrest-seed.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/forrest-seed.xml (original)
+++ forrest/trunk/tools/forrestbot/forrest-seed.xml Sat Apr 7 00:46:45 2007
@@ -16,12 +16,8 @@
limitations under the License.
-->
<project name="forrest-seed" default="main">
-
- <property name="getsrc.svn.url"
value="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site"/>
- <target name="getsrc" depends="getsrc.clean-workdir, getsrc.svn"/>
-
- <property environment="env"/>
- <import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
+ <property name="getsrc.svn.url"
value="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site"/>
+ <target name="getsrc" depends="getsrc.clean-workdir, getsrc.svn"/>
+ <property environment="env"/>
+ <import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
</project>
-
Modified: forrest/trunk/tools/forrestbot/forrest.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/forrest.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/forrest.xml (original)
+++ forrest/trunk/tools/forrestbot/forrest.xml Sat Apr 7 00:46:45 2007
@@ -16,16 +16,13 @@
limitations under the License.
-->
<project name="forrest" default="main">
-
<property name="getsrc.svn.url"
value="http://svn.apache.org/repos/asf/forrest/trunk"/>
<target name="getsrc" depends="getsrc.clean-workdir, getsrc.svn"/>
-
- <!-- create this file to be an ant project (not stored in CVS or SVN)
+<!-- create this file to be an ant project (not stored in CVS or SVN)
that sets deploy.svn.user and deploy.svn.password propeties -->
<import file="deploy.svn.settings" optional="true"/>
<property name="deploy.svn.url"
value="https://svn.apache.org/repos/asf/forrest/site"/>
<target name="deploy" depends="deploy.svn"/>
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
</project>
Modified: forrest/trunk/tools/forrestbot/incubator.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/incubator.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/incubator.xml (original)
+++ forrest/trunk/tools/forrestbot/incubator.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="incubator" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/sf-struts.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/sf-struts.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/sf-struts.xml (original)
+++ forrest/trunk/tools/forrestbot/sf-struts.xml Sat Apr 7 00:46:45 2007
@@ -16,15 +16,11 @@
limitations under the License.
-->
<project name="struts-site" default="main">
-
<property name="getsrc.cvs.user" value="anonymous"/>
<property name="getsrc.cvs.password" value=""/>
<property name="getsrc.cvs.root" value="/cvsroot/struts"/>
<property name="getsrc.cvs.host" value="cvs.sourceforge.net"/>
<property name="getsrc.cvs.module" value="${ant.project.name}"/>
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/webapp/maven.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/maven.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/maven.xml (original)
+++ forrest/trunk/tools/forrestbot/webapp/maven.xml Sat Apr 7 00:46:45 2007
@@ -18,6 +18,4 @@
<project
default="war"
xmlns:j="jelly:core"
- xmlns:u="jelly:util">
-
-</project>
\ No newline at end of file
+ xmlns:u="jelly:util"></project>
Modified: forrest/trunk/tools/forrestbot/webapp/project.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/project.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/project.xml (original)
+++ forrest/trunk/tools/forrestbot/webapp/project.xml Sat Apr 7 00:46:45 2007
@@ -16,129 +16,146 @@
limitations under the License.
-->
<project>
-
- <!-- the version of maven's project object model -->
+<!-- the version of maven's project object model -->
<pomVersion>3</pomVersion>
-
- <!-- a unique name for this project -->
+<!-- a unique name for this project -->
<id>forrestbot-webapp</id>
-
- <!-- a short but descriptive name for the project -->
+<!-- a short but descriptive name for the project -->
<name>Forrestbot Webapp</name>
-
- <!-- The version of the project under development, e.g.
+<!-- The version of the project under development, e.g.
1.1, 1.2, 2.0-SNAPSHOT -->
<currentVersion>2.0</currentVersion>
-
- <!-- details about the organization that 'owns' the project -->
+<!-- details about the organization that 'owns' the project -->
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
-
- <!-- the year the project started -->
+<!-- the year the project started -->
<inceptionYear>2004</inceptionYear>
<package>org.apache.forrest.forrestbot.webapp</package>
-
- <!-- jar files the project is dependent on -->
+<!-- jar files the project is dependent on -->
<dependencies>
- <!-- for build only -->
+<!-- for build only -->
<dependency>
<id>servletapi</id>
<version>2.3</version>
</dependency>
-
- <!-- include in war for runtime -->
+<!-- include in war for runtime -->
<dependency>
<id>xerces</id>
<version>2.4.0</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>jstl</id>
<version>1.0.2</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>log4j</id>
<version>1.2.8</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>struts</id>
<version>1.1</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>struts</id>
<artifactId>struts-el</artifactId>
<version>1.1</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.0.4</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>commons-beanutils</id>
<version>1.6.1</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>commons-digester</id>
<version>1.5</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>commons-collections</id>
<version>2.1</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>commons-validator</id>
<version>1.0.2</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
-
- <!-- osuser and dependencies -->
+<!-- osuser and dependencies -->
<dependency>
<id>osuser</id>
<version>1.0-dev</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>oscore</id>
<version>2.2.2</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>propertyset</id>
<version>1.2</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<id>dom4j</id>
<version>1.4</version>
- <properties><war.bundle>true</war.bundle></properties>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
-
- <!-- 2.3+ servlet container would have the struts tlds already
+<!-- 2.3+ servlet container would have the struts tlds already
...
-->
-
</dependencies>
-
- <!-- build information for the project -->
+<!-- build information for the project -->
<build>
<sourceDirectory>src</sourceDirectory>
-
<resources>
<resource>
<directory>src/conf</directory>
@@ -157,7 +174,4 @@
</resource>
</resources>
</build>
-
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/webapp/src/conf/groups.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/conf/groups.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/conf/groups.xml (original)
+++ forrest/trunk/tools/forrestbot/webapp/src/conf/groups.xml Sat Apr 7
00:46:45 2007
@@ -15,29 +15,27 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!--
if a user is in the same group as a project, they have access to build it
The projects and users must also be specified in projects.xml and users.xml,
respectively
-->
<groups>
- <group id="All Projects">
- <!-- projects -->
- <user id="avalon-phoenix"/>
- <user id="avalon-site"/>
- <user id="cocoon-site"/>
- <user id="forrest"/>
- <user id="forrest-krysalis"/>
- <user id="forrest-seed"/>
- <user id="incubator"/>
- <user id="ws-site"/>
- <user id="xml-fop"/>
- <user id="xml-site"/>
- <user id="xml-xindice"/>
- <user id="xml-xmlbeans"/>
-
- <!-- users -->
- <user id="forrest-dev"/>
- </group>
-</groups>
\ No newline at end of file
+ <group id="All Projects">
+<!-- projects -->
+ <user id="avalon-phoenix"/>
+ <user id="avalon-site"/>
+ <user id="cocoon-site"/>
+ <user id="forrest"/>
+ <user id="forrest-krysalis"/>
+ <user id="forrest-seed"/>
+ <user id="incubator"/>
+ <user id="ws-site"/>
+ <user id="xml-fop"/>
+ <user id="xml-site"/>
+ <user id="xml-xindice"/>
+ <user id="xml-xmlbeans"/>
+<!-- users -->
+ <user id="forrest-dev"/>
+ </group>
+</groups>
Modified: forrest/trunk/tools/forrestbot/webapp/src/conf/osuser.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/conf/osuser.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/conf/osuser.xml (original)
+++ forrest/trunk/tools/forrestbot/webapp/src/conf/osuser.xml Sat Apr 7
00:46:45 2007
@@ -16,23 +16,20 @@
limitations under the License.
-->
<opensymphony-user>
- <!-- users -->
- <provider
class="com.opensymphony.user.provider.file.XMLCredentialsProvider">
- <property name="storeFile">users.xml</property>
- <property name="storeFileType">resource</property>
- </provider>
-
- <!-- projects (technically users; if a user is in the same group as a
project, they have access to build it) -->
- <provider
class="com.opensymphony.user.provider.file.XMLCredentialsProvider">
- <property name="storeFile">projects.xml</property>
- <property name="storeFileType">resource</property>
- </provider>
-
- <!-- groups -->
- <provider class="com.opensymphony.user.provider.file.XMLAccessProvider">
- <property name="storeFile">groups.xml</property>
- <property name="storeFileType">resource</property>
- </provider>
-
- <provider
class="com.opensymphony.user.provider.memory.MemoryProfileProvider" />
-</opensymphony-user>
\ No newline at end of file
+<!-- users -->
+ <provider class="com.opensymphony.user.provider.file.XMLCredentialsProvider">
+ <property name="storeFile">users.xml</property>
+ <property name="storeFileType">resource</property>
+ </provider>
+<!-- projects (technically users; if a user is in the same group as a project,
they have access to build it) -->
+ <provider class="com.opensymphony.user.provider.file.XMLCredentialsProvider">
+ <property name="storeFile">projects.xml</property>
+ <property name="storeFileType">resource</property>
+ </provider>
+<!-- groups -->
+ <provider class="com.opensymphony.user.provider.file.XMLAccessProvider">
+ <property name="storeFile">groups.xml</property>
+ <property name="storeFileType">resource</property>
+ </provider>
+ <provider
class="com.opensymphony.user.provider.memory.MemoryProfileProvider" />
+</opensymphony-user>
Modified: forrest/trunk/tools/forrestbot/webapp/src/conf/projects.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/conf/projects.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/conf/projects.xml (original)
+++ forrest/trunk/tools/forrestbot/webapp/src/conf/projects.xml Sat Apr 7
00:46:45 2007
@@ -15,19 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- list of all projects; should correspond to projects buildfiles in your
'config-dir' directory -->
<users>
- <user id="avalon-phoenix"/>
- <user id="avalon-site"/>
- <user id="cocoon-site"/>
- <user id="forrest"/>
- <user id="forrest-krysalis"/>
- <user id="forrest-seed"/>
- <user id="incubator"/>
- <user id="ws-site"/>
- <user id="xml-fop"/>
- <user id="xml-site"/>
- <user id="xml-xindice"/>
- <user id="xml-xmlbeans"/>
-</users>
\ No newline at end of file
+ <user id="avalon-phoenix"/>
+ <user id="avalon-site"/>
+ <user id="cocoon-site"/>
+ <user id="forrest"/>
+ <user id="forrest-krysalis"/>
+ <user id="forrest-seed"/>
+ <user id="incubator"/>
+ <user id="ws-site"/>
+ <user id="xml-fop"/>
+ <user id="xml-site"/>
+ <user id="xml-xindice"/>
+ <user id="xml-xmlbeans"/>
+</users>
Modified: forrest/trunk/tools/forrestbot/webapp/src/conf/users.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/conf/users.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/conf/users.xml (original)
+++ forrest/trunk/tools/forrestbot/webapp/src/conf/users.xml Sat Apr 7
00:46:45 2007
@@ -15,8 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<users>
- <!-- list all users and passwords -->
- <user id="forrest-dev" password="forrest-dev"/>
-</users>
\ No newline at end of file
+<!-- list all users and passwords -->
+ <user id="forrest-dev" password="forrest-dev"/>
+</users>
Modified:
forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-config.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-config.xml
(original)
+++ forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-config.xml
Sat Apr 7 00:46:45 2007
@@ -33,25 +33,25 @@
<forward name="index" path="/summary.do" />
</global-forwards>
<action-mappings>
- <!-- these forward to tile definitions, which in turn put the decorations
around the content JSP file -->
+<!-- these forward to tile definitions, which in turn put the decorations
around the content JSP file -->
<action
type="org.apache.forrest.forrestbot.webapp.action.ViewSummaryAction"
path="/summary"
name="LoginForm"
scope="request"
validate="false"
input="/summary.jsp">
- <forward name="Success" path="summary"/>
- <forward name="Failure" path="summary"/>
- <forward name="Authorized" path="summaryAuthorized"/>
+ <forward name="Success" path="summary"/>
+ <forward name="Failure" path="summary"/>
+ <forward name="Authorized" path="summaryAuthorized"/>
</action>
<action
type="org.apache.forrest.forrestbot.webapp.action.ViewLogFrameAction"
path="/viewlog">
- <forward name="Success" path="viewlog_frame"/>
+ <forward name="Success" path="viewlog_frame"/>
</action>
<action
type="org.apache.forrest.forrestbot.webapp.action.ViewLogBodyAction"
path="/viewlog_body">
- <forward name="Success" path="viewlog_body"/>
+ <forward name="Success" path="viewlog_body"/>
</action>
<action
type="org.apache.forrest.forrestbot.webapp.action.ViewLogHeaderAction"
path="/viewlog_header">
- <forward name="Success" path="viewlog_header"/>
+ <forward name="Success" path="viewlog_header"/>
</action>
<action type="org.apache.forrest.forrestbot.webapp.action.ExecuteAction"
path="/execute"
@@ -59,15 +59,13 @@
scope="request"
validate="false"
input="/summary.jsp">
- <forward name="Success" path="execute"/>
+ <forward name="Success" path="execute"/>
</action>
<action type="org.apache.forrest.forrestbot.webapp.action.LogoutAction"
path="/logout">
- <forward name="Success" path="logout"/>
+ <forward name="Success" path="logout"/>
</action>
</action-mappings>
-
<message-resources
parameter="org.apache.forrest.forrestbot.webapp.Resources"/>
-
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property value="/WEB-INF/struts-tiles.xml"
property="definitions-config" />
<set-property value="true" property="definitions-parser-validate" />
Modified:
forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-tiles.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-tiles.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-tiles.xml
(original)
+++ forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-tiles.xml
Sat Apr 7 00:46:45 2007
@@ -17,42 +17,36 @@
-->
<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles
Configuration//EN" "http://jakarta.apache.org/struts/dtds/tiles-config.dtd";>
<tiles-definitions>
- <definition name="summary" path="/common/layout.jsp">
- <put name="title" value="Forrestbot Web Interface" direct="true"/>
- <put name="header" value="/common/header.jsp"/>
- <put name="welcome" value="/welcome.html"/>
- <put name="welcome-local" value="/welcome.local.html"/>
- <put name="login" value="/loginForm.jsp"/>
- <put name="footer" value="/common/footer.jsp"/>
- <put name="body-content" value="/summary.jsp"/>
- </definition>
-
- <definition name="summaryAuthorized" extends="summary">
- <put name="title" value="Forrestbot Web Interface - authorized"
direct="true"/>
- <put name="login" value="/commandForm.jsp"/>
- </definition>
-
- <definition name="execute" path="/common/simple.jsp">
- <put name="title" value="Forrestbot Web Interface" direct="true"/>
- <put name="header" value="/common/header.jsp"/>
- <put name="footer" value="/common/footer.jsp"/>
- <put name="body-content" value="/execute.jsp"/>
- </definition>
-
- <definition name="viewlog_frame" path="/common/viewlog_frame.jsp">
- <put name="title" value="Forrestbot log" direct="true"/>
- </definition>
-
- <definition name="viewlog_body" path="/viewlog_body.jsp"/>
- <definition name="viewlog_header" path="/viewlog_header.jsp">
- <put name="title" value="Forrestbot log" direct="true"/>
- </definition>
-
- <definition name="logout" path="/common/simple.jsp">
- <put name="title" value="Forrestbot Web Interface" direct="true"/>
- <put name="header" value="/common/header.jsp"/>
- <put name="footer" value="/common/footer.jsp"/>
- <put name="body-content" value="/logout.jsp"/>
- </definition>
-
+ <definition name="summary" path="/common/layout.jsp">
+ <put name="title" value="Forrestbot Web Interface" direct="true"/>
+ <put name="header" value="/common/header.jsp"/>
+ <put name="welcome" value="/welcome.html"/>
+ <put name="welcome-local" value="/welcome.local.html"/>
+ <put name="login" value="/loginForm.jsp"/>
+ <put name="footer" value="/common/footer.jsp"/>
+ <put name="body-content" value="/summary.jsp"/>
+ </definition>
+ <definition name="summaryAuthorized" extends="summary">
+ <put name="title" value="Forrestbot Web Interface - authorized"
direct="true"/>
+ <put name="login" value="/commandForm.jsp"/>
+ </definition>
+ <definition name="execute" path="/common/simple.jsp">
+ <put name="title" value="Forrestbot Web Interface" direct="true"/>
+ <put name="header" value="/common/header.jsp"/>
+ <put name="footer" value="/common/footer.jsp"/>
+ <put name="body-content" value="/execute.jsp"/>
+ </definition>
+ <definition name="viewlog_frame" path="/common/viewlog_frame.jsp">
+ <put name="title" value="Forrestbot log" direct="true"/>
+ </definition>
+ <definition name="viewlog_body" path="/viewlog_body.jsp"/>
+ <definition name="viewlog_header" path="/viewlog_header.jsp">
+ <put name="title" value="Forrestbot log" direct="true"/>
+ </definition>
+ <definition name="logout" path="/common/simple.jsp">
+ <put name="title" value="Forrestbot Web Interface" direct="true"/>
+ <put name="header" value="/common/header.jsp"/>
+ <put name="footer" value="/common/footer.jsp"/>
+ <put name="body-content" value="/logout.jsp"/>
+ </definition>
</tiles-definitions>
Modified: forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/web.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/web.xml (original)
+++ forrest/trunk/tools/forrestbot/webapp/src/webapp/WEB-INF/web.xml Sat Apr 7
00:46:45 2007
@@ -15,11 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/j2ee/dtds/web-app_2_3.dtd";>
-
<web-app>
<servlet>
<servlet-name>action</servlet-name>
@@ -38,5 +36,4 @@
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
-
</web-app>
Modified: forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.html
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.html?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.html (original)
+++ forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.html Sat Apr 7
00:46:45 2007
@@ -15,8 +15,11 @@
limitations under the License.
-->
<p>
-This interface allows you to <b>build</b> a copy of a project website (using
-the latest project docs) and view it. If it is acceptable, you can
-<b>deploy</b> it to the live site.
+ This interface allows you to
+ <b>build</b>
+ a copy of a project website (using the latest project docs) and view it. If
it
+ is acceptable, you can
+ <b>deploy</b>
+ it to the live site.
</p>
-<hr>
\ No newline at end of file
+<hr />
Modified: forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.local.html
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.local.html?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.local.html
(original)
+++ forrest/trunk/tools/forrestbot/webapp/src/webapp/welcome.local.html Sat Apr
7 00:46:45 2007
@@ -15,11 +15,11 @@
limitations under the License.
-->
<p>
-To request a username/password that allows you to build and/or deploy your
-project's site, please mail <a href="mailto:site.administrator";>Insert
-Site Administrator Here</a>.
+ To request a username/password that allows you to build and/or deploy your
+ project's site, please mail <a href="mailto:site.administrator";>Insert Site
+ Administrator Here</a>.
</p>
<p>
-This file is welcome.local.html, please modify to suit your installation
+ This file is welcome.local.html, please modify to suit your installation
</p>
-<hr>
\ No newline at end of file
+<hr />
Modified: forrest/trunk/tools/forrestbot/ws-site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/ws-site.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/ws-site.xml (original)
+++ forrest/trunk/tools/forrestbot/ws-site.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="ws-site" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/xml-fop.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/xml-fop.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/xml-fop.xml (original)
+++ forrest/trunk/tools/forrestbot/xml-fop.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="xml-fop" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/xml-site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/xml-site.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/xml-site.xml (original)
+++ forrest/trunk/tools/forrestbot/xml-site.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="xml-site" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/xml-xindice.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/xml-xindice.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/xml-xindice.xml (original)
+++ forrest/trunk/tools/forrestbot/xml-xindice.xml Sat Apr 7 00:46:45 2007
@@ -16,9 +16,6 @@
limitations under the License.
-->
<project name="xml-xindice" default="main">
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
Modified: forrest/trunk/tools/forrestbot/xml-xmlbeans.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/xml-xmlbeans.xml?view=diff&rev=526391&r1=526390&r2=526391
==============================================================================
--- forrest/trunk/tools/forrestbot/xml-xmlbeans.xml (original)
+++ forrest/trunk/tools/forrestbot/xml-xmlbeans.xml Sat Apr 7 00:46:45 2007
@@ -16,11 +16,7 @@
limitations under the License.
-->
<project name="xml-xmlbeans" default="main">
-
<property name="getsrc.cvs.module" value="xml-xmlbeans/website"/>
-
<property environment="env"/>
<import file="${env.FORREST_HOME}/tools/forrestbot/core/forrestbot.xml"/>
-
</project>
-
