Author: crossley
Date: Mon Jun 7 06:29:14 2010
New Revision: 952114
URL: http://svn.apache.org/viewvc?rev=952114&view=rev
Log:
Enable "deploy.svn.user" either via deploy.svn.settings file or via env.USER
Issue: FOR-1198
Modified:
forrest/trunk/plugins/build.xml
forrest/trunk/tools/forrestbot/core/deploy.xml
forrest/trunk/tools/forrestbot/core/getsrc.xml
Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/build.xml?rev=952114&r1=952113&r2=952114&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Mon Jun 7 06:29:14 2010
@@ -52,6 +52,10 @@
<property name="build.dir" location="build"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.docs" location="${build.dir}/site"/>
+<!-- Option to set username via deploy.svn.settings -->
+ <import file="${forrest.home}/deploy.svn.settings" optional="true"/>
+<!-- Set the default username, if not already set via deploy.svn.settings -->
+ <property name="deploy.svn.user" value="${env.USER}"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<fileset dir="${forrest.ant.lib.dir}" includes="ant-contrib-*.jar" />
@@ -161,6 +165,8 @@
<!-- check in to SVN -->
<exec executable="svn" dir="." failonerror="true">
<arg value="commit"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${deploy.plugins.svn-dir}"/>
<arg value="-m Deployment plugins descriptor file plugins.xml (deployed by 'deploy-plugins.xml' target of plugin build script)"/>
</exec>
@@ -245,6 +251,8 @@
<!-- check in to SVN -->
<exec executable="svn" dir="." failonerror="true">
<arg value="commit"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${deploy.docs.svn-dir}/plugins_${docsVersion}"/>
<arg value="-m Deployment of docs for ${plugin-name} plugin (deployed by 'deploy-docs' target of plugin build script)"/>
</exec>
@@ -304,6 +312,8 @@ You have just released a plugin. There a
<!-- check in to SVN -->
<exec executable="svn" dir="." failonerror="true">
<arg value="commit"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${deploy.plugins.svn-dir}"/>
<arg value="-m Deployment of ${plugin-name} plugin (deployed by 'deploy' target of plugin build script)"/>
</exec>
@@ -327,6 +337,8 @@ You have just released a plugin. There a
<!-- get current plugins directory from SVN -->
<exec executable="svn" dir="." failonerror="true">
<arg value="co"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${deploy.plugin.docs.svn.url}"/>
<arg value="${deploy.docs.svn-dir}"/>
</exec>
@@ -336,6 +348,8 @@ You have just released a plugin. There a
<!-- get current plugins directory from SVN -->
<exec executable="svn" dir="." failonerror="true">
<arg value="co"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${deploy.plugins.svn.url}"/>
<arg value="${deploy.plugins.svn-dir}"/>
</exec>
Modified: forrest/trunk/tools/forrestbot/core/deploy.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/deploy.xml?rev=952114&r1=952113&r2=952114&view=diff
==============================================================================
--- forrest/trunk/tools/forrestbot/core/deploy.xml (original)
+++ forrest/trunk/tools/forrestbot/core/deploy.xml Mon Jun 7 06:29:14 2010
@@ -140,6 +140,8 @@
<!-- The deploy.svn target -->
<!-- ================================================================= -->
<property name="deploy.svn.url" value=""/>
+<!-- Set the default username, if not already set via deploy.svn.settings -->
+ <property name="deploy.svn.user" value="${env.USER}"/>
<property name="deploy.svn.commit-message" value="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"/>
@@ -147,6 +149,8 @@
<!-- get current SVN source -->
<exec executable="svn" dir="." failonerror="true">
<arg value="co"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${deploy.svn.url}"/>
<arg value="${deploy.svn.svn-dir}"/>
</exec>
@@ -194,9 +198,10 @@
<!-- check in to SVN -->
<exec executable="svn" dir="." failonerror="true">
<arg value="commit"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${deploy.svn.svn-dir}"/>
<arg value="-m ${deploy.svn.commit-message}"/>
</exec>
-
</target>
</project>
Modified: forrest/trunk/tools/forrestbot/core/getsrc.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/getsrc.xml?rev=952114&r1=952113&r2=952114&view=diff
==============================================================================
--- forrest/trunk/tools/forrestbot/core/getsrc.xml (original)
+++ forrest/trunk/tools/forrestbot/core/getsrc.xml Mon Jun 7 06:29:14 2010
@@ -81,11 +81,14 @@
<property name="getsrc.svn.url" value=""/>
<property name="getsrc.svn.revision" value="HEAD"/>
<property name="build.svn-dir" location="work/svn"/>
+ <property name="deploy.svn.user" value="${env.USER}"/>
<target name="getsrc.svn" description="FB: Get source from an SVN repository">
<echo level="info">svn: ${getsrc.svn.url} -> ${build.svn-dir}/${ant.project.name}</echo>
<exec executable="svn" dir="." failonerror="true">
<arg value="co"/>
+ <arg value="--username"/>
+ <arg value="${deploy.svn.user}"/>
<arg value="${getsrc.svn.url}"/>
<arg value="${build.svn-dir}/${ant.project.name}"/>
</exec>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.