jvanzyl 02/03/16 16:12:15
Modified: . build-bootstrap.xml
src/java/org/apache/maven ProjectProperties.java
src/java/org/apache/maven/jxr DirectoryIndexer.java
src/templates/build build-docs.xml
Removed: xdocs/images file.gif folder.gif
Log:
Adding the images needed by the cross referencer to the install and
and pointer the jxr task at ${maven.home} to find them. This should
allow any project to generate the xref now.
Revision Changes Path
1.43 +4 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build-bootstrap.xml 16 Mar 2002 14:00:22 -0000 1.42
+++ build-bootstrap.xml 17 Mar 2002 00:12:15 -0000 1.43
@@ -125,6 +125,10 @@
<copy tofile="${maven.home}/install/maven.jar" file="target/maven-0.1.jar"/>
<copy todir="${maven.home}/install" file="src/install/build.xml"/>
+ <copy todir="${maven.home}/images">
+ <fileset dir="src/images"/>
+ </copy>
+
<copy todir="${maven.home}/install">
<fileset dir="${lib.repo}">
<include name="dom4j-1.3.jar"/>
1.11 +1 -4
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ProjectProperties.java 16 Mar 2002 19:49:13 -0000 1.10
+++ ProjectProperties.java 17 Mar 2002 00:12:15 -0000 1.11
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.10 2002/03/16 19:49:13 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.11 2002/03/17 00:12:15 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -122,11 +122,8 @@
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.7 +11 -5
jakarta-turbine-maven/src/java/org/apache/maven/jxr/DirectoryIndexer.java
Index: DirectoryIndexer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jxr/DirectoryIndexer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DirectoryIndexer.java 28 Feb 2002 23:26:49 -0000 1.6
+++ DirectoryIndexer.java 17 Mar 2002 00:12:15 -0000 1.7
@@ -73,7 +73,7 @@
* Handles building a directory index of files and directories.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
- * @version $Id: DirectoryIndexer.java,v 1.6 2002/02/28 23:26:49 jvanzyl Exp $
+ * @version $Id: DirectoryIndexer.java,v 1.7 2002/03/17 00:12:15 jvanzyl Exp $
*/
public class DirectoryIndexer
{
@@ -82,10 +82,12 @@
* Description of the Field
*/
public final static int MODE_FULL = 1;
+
/**
* Description of the Field
*/
public final static int MODE_JAVA = 2;
+
/**
* Description of the Field
*/
@@ -100,13 +102,16 @@
* Description of the Field
*/
public final static String IMAGE_DIRECTORY = "./folder.gif";
+
/**
* Description of the Field
*/
+
public final static String IMAGE_FILE = "./file.gif";
/**
* Description of the Field
*/
+
public final static int IMAGE_WIDTH = 15;
private File directory = null;
@@ -184,8 +189,11 @@
this.image_folder = image_folder;
this.image_file = image_file;
- copy(image_folder, directory + System.getProperty("file.separator") +
DirectoryIndexer.IMAGE_DIRECTORY);
- copy(image_file, directory + System.getProperty("file.separator") +
DirectoryIndexer.IMAGE_FILE);
+ copy(image_folder, directory + System.getProperty("file.separator") +
+ DirectoryIndexer.IMAGE_DIRECTORY);
+
+ copy(image_file, directory + System.getProperty("file.separator") +
+ DirectoryIndexer.IMAGE_FILE);
this.process();
}
@@ -205,8 +213,6 @@
String index = directory.getAbsolutePath() +
System.getProperty("file.separator") +
INDEX;
-
- //System.out.println("\tWriting index file -> " + index);
PrintWriter out = new PrintWriter(new FileOutputStream(index));
1.31 +3 -3 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build-docs.xml 16 Mar 2002 19:49:13 -0000 1.30
+++ build-docs.xml 17 Mar 2002 00:12:15 -0000 1.31
@@ -33,9 +33,9 @@
<jxr
startDir="src/java"
destDir="docs/xref"
- imageFolder="xdocs/images/folder.gif"
- imageFile="xdocs/images/file.gif"
- />
+ imageFolder="${maven.home}/images/folder.gif"
+ imageFile="${maven.home}/images/file.gif">
+ </jxr>
<!-- The last two parameters don't really matter but the
task craps out if they aren't there. -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
