jvanzyl 02/03/16 11:49:13
Modified: . project.xml
src/java/org/apache/maven ProjectProperties.java
src/java/org/apache/maven/project Project.java
src/templates/build build-docs.xml
Log:
Adding necessary bits so that the deploy-site will work with settings
defined in the project descriptor.
Revision Changes Path
1.26 +3 -1 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 16 Mar 2002 04:54:21 -0000 1.25
+++ project.xml 16 Mar 2002 19:49:12 -0000 1.26
@@ -41,6 +41,8 @@
<url>http://jakarta.apache.org/turbine/maven/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</cvsWebUrl>
+ <siteAddress>jakarta.apache.org</siteAddress>
+ <siteDirectory>/www/jakarta.apache.org/turbine/maven/</siteDirectory>
<mailingLists>
<mailingList>
@@ -243,7 +245,7 @@
</dependencies>
<build>
-
+
<sourceDirectories>
<sourceDirectory>src/java</sourceDirectory>
</sourceDirectories>
1.10 +6 -1
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProjectProperties.java 15 Mar 2002 14:55:12 -0000 1.9
+++ ProjectProperties.java 16 Mar 2002 19:49:13 -0000 1.10
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.9 2002/03/15 14:55:12 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.10 2002/03/16 19:49:13 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -122,6 +122,11 @@
getProject().setProperty("organization", mavenProject.getOrganization());
getProject().setProperty("inceptionYear", mavenProject.getInceptionYear());
getProject().setProperty("package", mavenProject.getPackage());
+
+ getProject().setProperty("siteAddress", mavenProject.getSiteAddress());
+ getProject().setProperty("siteDirectory", mavenProject.getSiteDirectory());
+
+
}
// Create the classpath reference
1.6 +47 -1
jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Project.java 24 Feb 2002 17:45:37 -0000 1.5
+++ Project.java 16 Mar 2002 19:49:13 -0000 1.6
@@ -1,4 +1,5 @@
package org.apache.maven.project;
+
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -59,7 +60,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Project.java,v 1.5 2002/02/24 17:45:37 jvanzyl Exp $
+ * @version $Id: Project.java,v 1.6 2002/03/16 19:49:13 jvanzyl Exp $
*/
public class Project
extends BaseObject
@@ -126,6 +127,17 @@
private String projectPackage;
/**
+ * The site where the project is hosted. For example:
+ * jakarta.apache.org.
+ */
+ private String siteAddress;
+
+ /**
+ * The directory on the server where the site is stored.
+ */
+ private String siteDirectory;
+
+ /**
* Default constructor.
*/
public Project()
@@ -134,6 +146,40 @@
mailingLists = new ArrayList();
developers = new ArrayList();
}
+
+ /**
+ * Set the site address where the documentation
+ * lives.
+ */
+ public void setSiteAddress(String siteAddress)
+ {
+ this.siteAddress = siteAddress;
+ }
+
+ /**
+ * Get the site address.
+ */
+ public String getSiteAddress()
+ {
+ return siteAddress;
+ }
+
+ /**
+ * Set the site directory where the documentation
+ * lives.
+ */
+ public void setSiteDirectory(String siteDirectory)
+ {
+ this.siteDirectory = siteDirectory;
+ }
+
+ /**
+ * Get the site directory.
+ */
+ public String getSiteDirectory()
+ {
+ return siteDirectory;
+ }
/**
* Add a dependency for this project.
1.30 +10 -5 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build-docs.xml 16 Mar 2002 05:12:25 -0000 1.29
+++ build-docs.xml 16 Mar 2002 19:49:13 -0000 1.30
@@ -234,24 +234,29 @@
name="deploy-site"
depends="site">
+ <echo>
+ siteAddress = ${siteAddress}
+ siteDirectory = ${siteDirectory}
+ </echo>
+
<!-- This needs to taken from the project properties -->
- <property name="homepage" value="/www/jakarta.apache.org/turbine/maven/"/>
-
+ <property name="homepage" value="${siteDirectory}"/>
+
<tar tarfile="${project}-site.tar" basedir="${docs.dest}"/>
<gzip zipfile="${project}-site.tar.gz" src="${project}-site.tar"/>
<delete file="${project}-site.tar"/>
<exec dir="." executable="scp">
<arg value="${project}-site.tar.gz"/>
- <arg value="jakarta.apache.org:${homepage}"/>
+ <arg value="${siteAddress}:${homepage}"/>
</exec>
<exec dir="." executable="ssh">
- <arg line="jakarta.apache.org 'cd ${homepage};gunzip
${project}-site.tar.gz;tar xUvf ${project}-site.tar;rm ${project}-site.tar'"/>
+ <arg line="${siteAddress} 'cd ${homepage};gunzip ${project}-site.tar.gz;tar
xUvf ${project}-site.tar;rm ${project}-site.tar'"/>
</exec>
<delete file="${project}-site.tar.gz"/>
-
+
</target>
<!-- ================================================================== -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
