You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/12 18:02:11 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven AddPathTag.java
jvanzyl 2003/01/12 09:02:11
Modified: src/java/org/apache/maven/jelly/tags/maven AddPathTag.java
Log:
o Cleaning up the add path tag.
Revision Changes Path
1.2 +9 -15 jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/AddPathTag.java
Index: AddPathTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/AddPathTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddPathTag.java 31 Dec 2002 07:01:01 -0000 1.1
+++ AddPathTag.java 12 Jan 2003 17:02:11 -0000 1.2
@@ -59,8 +59,11 @@
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.commons.jelly.tags.ant.AntTagLibrary;
+import org.apache.commons.grant.GrantProject;
import org.apache.maven.MavenConstants;
import org.apache.maven.jelly.MavenJellyContext;
+import org.apache.maven.jelly.tags.BaseTagSupport;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
@@ -72,32 +75,25 @@
* @version $Id$
*/
public class AddPathTag
- extends TagSupport
+ extends BaseTagSupport
{
- /** the id of the path to be appended to*/
+ /** the id of the path to be appended to. */
private String id;
/** the path to append */
private String refid;
/**
- * @return the ant project in the current jelly context
- */
- public Project getProject()
- {
- return (Project) ( (MavenJellyContext) getContext() ).getVariable( MavenConstants.MAVEN_ANT_PROJECT );
- }
-
- /**
* Perform the tag processing. Look up the path by {@link #id} and append
* the {@link #refid other path} to it.
*
* @param output used to write output
* @throws Exception when anything goes wrong. FIXME
*/
- public void doTag( XMLOutput output ) throws Exception
+ public void doTag( XMLOutput output )
+ throws Exception
{
- Project project = getProject();
+ GrantProject project = getMavenContext().getProject().getAntProject();
if ( project == null )
{
@@ -105,9 +101,7 @@
}
Path path = (Path) project.getReferences().get( getId() );
-
Path addPath = (Path) project.getReferences().get( getRefid() );
-
path.append( addPath );
}