jvanzyl 2002/07/04 10:40:33
Modified: src/plugins/deploy-site plugin.jelly
Log:
We can now deploy the site again.
Revision Changes Path
1.3 +30 -35 jakarta-turbine-maven/src/plugins/deploy-site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/deploy-site/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 4 Jul 2002 05:03:29 -0000 1.2
+++ plugin.jelly 4 Jul 2002 17:40:33 -0000 1.3
@@ -7,46 +7,43 @@
<!-- ================================================================== -->
<goal
- name="check-maven-username">
-
+ name="deploy-site">
+
+ <!-- THIS CHECK IS NOT WORKING. FIX -->
+
+ <j:if test="${maven.username == ''}">
+
+ <fail>
+ +------------------------------------------------------------------
+ | ERROR!
+ |
+ | You must specify a maven username in order to deploy the site!
+ | You can either set this property in your ~/build.properties
+ | or specify one on the command line:
+ |
+ | maven -Dmaven.username=${user.name} deploy-site
+ +------------------------------------------------------------------
+ </fail>
+
+ </j:if>
+
<!--
- unless="maven.username">
- Not sure if there's an unless jelly tag or what syntax I need
- to test for null.
+ Generate the site documentation if it has not already been generated.
+ We need some markers or timestamps for this so we don't repeat work
+ if it's not necessary.
-->
- <fail>
- +------------------------------------------------------------------
- | ERROR!
- |
- | You must specify a maven username in order to deploy the site!
- | You can either set this property in your ~/build.properties
- | or specify one on the command line:
- |
- | maven -Dmaven.username=${user.name} deploy-site
- +------------------------------------------------------------------
- </fail>
- </goal>
-
- <goal
- name="deploy-site"
- prereqs="check-maven-username, site,do-deploy-site"
- />
+ <attainGoal name="site-report"/>
- <goal
- name="do-deploy-site">
-
- <j:if test="${flags.mavenUserName}">
-
<echo>
- siteAddress = ${maven.siteAddress}
- siteDirectory = ${maven.siteDirectory}
+ siteAddress = ${pom.siteAddress}
+ siteDirectory = ${pom.siteDirectory}
</echo>
<!-- This needs to taken from the project properties -->
- <property name="maven.homepage" value="${maven.siteDirectory}"/>
+ <property name="maven.homepage" value="${pom.siteDirectory}"/>
<tar tarfile="${maven.final.name}-site.tar" basedir="${maven.docs.dest}"/>
<gzip zipfile="${maven.final.name}-site.tar.gz"
src="${maven.final.name}-site.tar"/>
@@ -54,17 +51,15 @@
<exec dir="." executable="${maven.scp.executable}">
<arg value="${maven.final.name}-site.tar.gz"/>
- <arg value="${maven.username}@${maven.siteAddress}:${maven.homepage}"/>
+ <arg value="${maven.username}@${pom.siteAddress}:${maven.homepage}"/>
</exec>
<exec dir="." executable="${maven.ssh.executable}">
- <arg line="${maven.siteAddress} -l ${maven.username} 'mkdir -p
${maven.homepage};cd ${maven.homepage};gunzip ${maven.final.name}-site.tar.gz;tar xUvf
${maven.final.name}-site.tar;chmod -R g+u *;rm ${maven.final.name}-site.tar'"/>
+ <arg line="${pom.siteAddress} -l ${maven.username} 'mkdir -p
${maven.homepage};cd ${maven.homepage};gunzip ${maven.final.name}-site.tar.gz;tar xUvf
${maven.final.name}-site.tar;chmod -R g+u *;rm ${maven.final.name}-site.tar'"/>
</exec>
<delete file="${maven.final.name}-site.tar.gz"/>
-
- </j:if>
-
+
</goal>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
