jvanzyl 02/02/28 15:26:49
Modified: . build-bootstrap.xml project.xml
src/java/org/apache/maven ProjectProperties.java
UpdateResources.java
src/java/org/apache/maven/jxr CodeTransform.java
DirectoryIndexer.java
src/java/org/apache/maven/transformer SourceTransformer.java
Log:
Adjusting for the new commons-lang and commons-io packages.
Revision Changes Path
1.21 +18 -4 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build-bootstrap.xml 28 Feb 2002 22:41:50 -0000 1.20
+++ build-bootstrap.xml 28 Feb 2002 23:26:48 -0000 1.21
@@ -15,9 +15,11 @@
<path id="classpath">
<pathelement location="${lib.repo}/dom4j-1.1.jar"/>
- <pathelement location="${lib.repo}/commons-util-0.1-dev.jar"/>
+ <pathelement location="${lib.repo}/commons-util-1.0-rc2-dev.jar"/>
+ <pathelement location="${lib.repo}/commons-lang-0.1-dev.jar"/>
<pathelement location="${lib.repo}/commons-beanutils.jar"/>
<pathelement location="${lib.repo}/commons-collections.jar"/>
+ <pathelement location="${lib.repo}/commons-io.jar"/>
<pathelement location="${lib.repo}/commons-graph.jar"/>
<pathelement location="${lib.repo}/log4j-1.1.3.jar"/>
<pathelement location="${lib.repo}/stratum-0.1-dev.jar"/>
@@ -114,10 +116,12 @@
-->
<classpath>
<pathelement location="${lib.repo}/dom4j-1.1.jar"/>
- <pathelement location="${lib.repo}/commons-util-0.1-dev.jar"/>
+ <pathelement location="${lib.repo}/commons-util-1.0-rc2-dev.jar"/>
+ <pathelement location="${lib.repo}/commons-lang-0.1-dev.jar"/>
<pathelement location="${lib.repo}/commons-beanutils.jar"/>
<pathelement location="${lib.repo}/commons-collections.jar"/>
<pathelement location="${lib.repo}/commons-graph.jar"/>
+ <pathelement location="${lib.repo}/commons-io.jar"/>
<pathelement location="${lib.repo}/log4j-1.1.3.jar"/>
<pathelement location="${lib.repo}/stratum-0.1-dev.jar"/>
<pathelement location="${lib.repo}/velocity-1.3-dev.jar"/>
@@ -167,8 +171,18 @@
verbose="false"
usetimestamp="true"/>
- <get src="${get.jars.baseUrl}/commons-util-0.1-dev.jar"
- dest="${lib.repo}/commons-util-0.1-dev.jar"
+ <get src="${get.jars.baseUrl}/commons-util-1.0-rc2-dev.jar"
+ dest="${lib.repo}/commons-util-1.0-rc2-dev.jar"
+ verbose="false"
+ usetimestamp="true"/>
+
+ <get src="${get.jars.baseUrl}/commons-lang-0.1-dev.jar"
+ dest="${lib.repo}/commons-lang-0.1-dev.jar"
+ verbose="false"
+ usetimestamp="true"/>
+
+ <get src="${get.jars.baseUrl}/commons-io.jar"
+ dest="${lib.repo}/commons-io.jar"
verbose="false"
usetimestamp="true"/>
1.13 +8 -3 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 28 Feb 2002 15:53:03 -0000 1.12
+++ project.xml 28 Feb 2002 23:26:48 -0000 1.13
@@ -177,20 +177,25 @@
<jar>dom4j-1.1.jar</jar>
</dependency>
- <!--
<dependency>
<name>commons-lang</name>
<type>required</type>
<version>0.1</version>
<jar>commons-lang-0.1-dev.jar</jar>
</dependency>
- -->
+
+ <dependency>
+ <name>commons-io</name>
+ <type>required</type>
+ <version>0.1</version>
+ <jar>commons-io.jar</jar>
+ </dependency>
<dependency>
<name>commons-util</name>
<type>required</type>
<version>0.1</version>
- <jar>commons-util-0.1-dev.jar</jar>
+ <jar>commons-util-0.1-rc2-dev.jar</jar>
</dependency>
<dependency>
1.2 +4 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectProperties.java 28 Feb 2002 22:41:02 -0000 1.1
+++ ProjectProperties.java 28 Feb 2002 23:26:48 -0000 1.2
@@ -63,7 +63,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.lang.Strings;
import org.apache.maven.executor.ProjectExecutor;
import org.apache.maven.project.Dependency;
@@ -79,7 +79,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.1 2002/02/28 22:41:02 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.2 2002/02/28 23:26:48 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -176,7 +176,7 @@
{
// We have something like the following pattern:
// include = conf/foo.xml
- includesSb.append(StringUtils.split(line,"=",-1)[1]).append(",");
+ includesSb.append(Strings.split(line,"=",-1)[1]).append(",");
}
@@ -184,7 +184,7 @@
{
// We have something like the following pattern:
// exclude = conf/foo.xml
- excludesSb.append(StringUtils.split(line,"=",-1)[1]).append(",");
+ excludesSb.append(Strings.split(line,"=",-1)[1]).append(",");
}
// We have a jar descriptor file
1.2 +1 -0
jakarta-turbine-maven/src/java/org/apache/maven/UpdateResources.java
Index: UpdateResources.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/UpdateResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UpdateResources.java 28 Feb 2002 22:41:02 -0000 1.1
+++ UpdateResources.java 28 Feb 2002 23:26:48 -0000 1.2
@@ -82,6 +82,7 @@
* @author [EMAIL PROTECTED] (Added Java 1.1 style HTTP basic auth)
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @todo Decouple from Ant: Touch and Ant project references.
+ * @todo Don't bail on FileNotFound exceptions
*/
public class UpdateResources
extends ProjectExecutor
1.8 +10 -10
jakarta-turbine-maven/src/java/org/apache/maven/jxr/CodeTransform.java
Index: CodeTransform.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jxr/CodeTransform.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CodeTransform.java 28 Feb 2002 22:29:01 -0000 1.7
+++ CodeTransform.java 28 Feb 2002 23:26:48 -0000 1.8
@@ -34,7 +34,7 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.lang.Strings;
import org.apache.maven.jxr.pacman.ClassType;
import org.apache.maven.jxr.pacman.PackageManager;
@@ -652,7 +652,7 @@
JavaFile jf =
FileManager.getInstance().getFile(this.getCurrentFilename());
javadocURI.append("/");
- javadocURI.append(StringUtils.replace(jf.getPackageType().getName(),
".", "/"));
+ javadocURI.append(Strings.replace(jf.getPackageType().getName(), ".",
"/"));
javadocURI.append("/");
if (jf.getClassType() != null)
{
@@ -941,8 +941,8 @@
href.append(this.getPackageRoot());
//now find out how to get to the dest package
- dest = StringUtils.replace(dest, ".*", "");
- dest = StringUtils.replace(dest, ".", "/");
+ dest = Strings.replace(dest, ".*", "");
+ dest = Strings.replace(dest, ".", "/");
href.append(dest);
@@ -1043,7 +1043,7 @@
if (pkg.indexOf(".*") != -1)
{
- pkg = StringUtils.replace(pkg, ".*", "");
+ pkg = Strings.replace(pkg, ".*", "");
}
else if (isPackage == false)
@@ -1066,7 +1066,7 @@
}
- pkg = StringUtils.replace(pkg, ";", "");
+ pkg = Strings.replace(pkg, ";", "");
//if this package is within the PackageManager then you can create an
HREF for it.
@@ -1078,7 +1078,7 @@
if (classname != null)
{
- line = StringUtils.replace(line, classname, "<a href=\"" +
+ line = Strings.replace(line, classname, "<a href=\"" +
this.getHREF(pkg.toString()) +
"/" +
classname +
@@ -1090,7 +1090,7 @@
}
//now replace the given package with a href
- line = StringUtils.replace(line, pkg.toString(), "<a href=\"" +
+ line = Strings.replace(line, pkg.toString(), "<a href=\"" +
this.getHREF(pkg.toString()) +
"/" +
DirectoryIndexer.INDEX +
@@ -1182,7 +1182,7 @@
String uri = line.substring(start, end);
- line = StringUtils.replace(line, uri, "<a href=\"" +
+ line = Strings.replace(line, uri, "<a href=\"" +
uri +
"\" target=\"alexandria_uri\">" +
uri +
@@ -1339,7 +1339,7 @@
//System.out.println( "find" );
- return StringUtils.replace(line, find, link);
+ return Strings.replace(line, find, link);
}
}
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DirectoryIndexer.java 26 Feb 2002 14:45:54 -0000 1.5
+++ DirectoryIndexer.java 28 Feb 2002 23:26:49 -0000 1.6
@@ -67,13 +67,13 @@
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.lang.Strings;
/**
* 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.5 2002/02/26 14:45:54 jvanzyl Exp $
+ * @version $Id: DirectoryIndexer.java,v 1.6 2002/02/28 23:26:49 jvanzyl Exp $
*/
public class DirectoryIndexer
{
@@ -255,7 +255,7 @@
}
}
- pkg = StringUtils.replace(pkg,
System.getProperty("file.separator"), ".");
+ pkg = Strings.replace(pkg, System.getProperty("file.separator"),
".");
out.println("</b></p>");
1.3 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java
Index: SourceTransformer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceTransformer.java 21 Feb 2002 14:09:43 -0000 1.2
+++ SourceTransformer.java 28 Feb 2002 23:26:49 -0000 1.3
@@ -67,8 +67,8 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- *
- * @version $Id: SourceTransformer.java,v 1.2 2002/02/21 14:09:43 jvanzyl Exp $
+ * @version $Id: SourceTransformer.java,v 1.3 2002/02/28 23:26:49 jvanzyl Exp $
+ * @todo Get fileContentsToString() in the commons and break vel dep.
*/
public class SourceTransformer
extends Task
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
