You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/01/02 02:33:30 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags BaseTagSupport.java
dion 2003/01/01 17:33:30
Modified: src/java/org/apache/maven/jelly/tags/velocity MergeTag.java
src/java/org/apache/maven/verifier
LocalSettingsVerifier.java
src/test/java/org/apache/maven/jelly/tags/velocity
JellyContextAdapterTest.java
src/java/org/apache/maven/project Project.java
src/java/org/apache/maven/jelly/tags/maven ReactorTag.java
src/test/java/org/apache/maven DVSLPathToolTest.java
src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
src/java/org/apache/maven/jelly/tags BaseTagSupport.java
Log:
Code cleanup
Revision Changes Path
1.5 +1 -2 jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/velocity/MergeTag.java
Index: MergeTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/velocity/MergeTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MergeTag.java 31 Dec 2002 12:18:57 -0000 1.4
+++ MergeTag.java 2 Jan 2003 01:33:29 -0000 1.5
@@ -58,7 +58,6 @@
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.velocity.context.Context;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
1.2 +1 -2 jakarta-turbine-maven/src/java/org/apache/maven/verifier/LocalSettingsVerifier.java
Index: LocalSettingsVerifier.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/verifier/LocalSettingsVerifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalSettingsVerifier.java 31 Dec 2002 07:05:20 -0000 1.1
+++ LocalSettingsVerifier.java 2 Jan 2003 01:33:29 -0000 1.2
@@ -57,7 +57,6 @@
*/
import org.apache.maven.AbstractMavenComponent;
-import org.apache.maven.MavenSession;
import org.apache.maven.project.Project;
import java.io.File;
1.2 +1 -2 jakarta-turbine-maven/src/test/java/org/apache/maven/jelly/tags/velocity/JellyContextAdapterTest.java
Index: JellyContextAdapterTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/jelly/tags/velocity/JellyContextAdapterTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JellyContextAdapterTest.java 21 Dec 2002 04:30:47 -0000 1.1
+++ JellyContextAdapterTest.java 2 Jan 2003 01:33:30 -0000 1.2
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Arrays;
import java.util.Set;
import java.util.HashSet;
1.53 +1 -3 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Project.java 31 Dec 2002 08:28:19 -0000 1.52
+++ Project.java 2 Jan 2003 01:33:30 -0000 1.53
@@ -82,8 +82,6 @@
import java.util.TreeSet;
import java.util.StringTokenizer;
-import com.werken.werkz.WerkzProject;
-
/**
* @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
1.5 +2 -4 jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReactorTag.java 1 Jan 2003 15:21:36 -0000 1.4
+++ ReactorTag.java 2 Jan 2003 01:33:30 -0000 1.5
@@ -59,9 +59,7 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.maven.MavenUtils;
-import org.apache.maven.MavenSession;
import org.apache.maven.project.Project;
-import org.apache.maven.jelly.MavenJellyContext;
import java.util.ArrayList;
import java.util.Iterator;
1.5 +5 -9 jakarta-turbine-maven/src/test/java/org/apache/maven/DVSLPathToolTest.java
Index: DVSLPathToolTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/DVSLPathToolTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DVSLPathToolTest.java 31 Dec 2002 07:09:47 -0000 1.4
+++ DVSLPathToolTest.java 2 Jan 2003 01:33:30 -0000 1.5
@@ -107,11 +107,9 @@
"/d1/d2"
};
- DVSLPathTool pt = new DVSLPathTool();
-
for ( int i = 0; i < test.length; i++ )
{
- assertEquals( expected[i], pt.getDirectoryComponent( test[i] ) );
+ assertEquals( expected[i], DVSLPathTool.getDirectoryComponent( test[i] ) );
}
}
@@ -195,18 +193,16 @@
"../../../.." ),
};
- DVSLPathTool pt = new DVSLPathTool();
-
for ( int i = 0; i < tests.length; i++ )
{
assertEquals( tests[i].toString(), tests[i].expected,
- pt.getRelativePath( tests[i].basedir, tests[i].filename ) );
+ DVSLPathTool.getRelativePath( tests[i].basedir, tests[i].filename ) );
}
for ( int i = 0; i < tests.length; i++ )
{
assertEquals( tests[i].toString(), tests[i].expectedNoBase,
- pt.getRelativePath( tests[i].filename ) );
+ DVSLPathTool.getRelativePath( tests[i].filename ) );
}
}
1.26 +0 -1 jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ProjectInheritanceTest.java 31 Dec 2002 07:10:11 -0000 1.25
+++ ProjectInheritanceTest.java 2 Jan 2003 01:33:30 -0000 1.26
@@ -59,7 +59,6 @@
import junit.framework.TestSuite;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.MavenUtils;
-import org.apache.maven.MavenSession;
import java.io.File;
import java.util.List;
1.2 +0 -2 jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/BaseTagSupport.java
Index: BaseTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/BaseTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseTagSupport.java 31 Dec 2002 07:01:38 -0000 1.1
+++ BaseTagSupport.java 2 Jan 2003 01:33:30 -0000 1.2
@@ -1,9 +1,7 @@
package org.apache.maven.jelly.tags;
import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.JellyContext;
import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.project.Project;
/* ====================================================================
* The Apache Software License, Version 1.1