You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Martin van den Bemt <ml...@mvdb.net> on 2002/12/12 17:30:37 UTC
Re: cvs commit:
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/task
JellyTask.java
Your welcome ;)
My first commit for jelly afaik (although I already seem to be a
contributor)
I'm probably also going to jelliefy nyx :)
Mvgr,
Martin
On Thu, 2002-12-12 at 17:25, James Strachan wrote:
> From: <mv...@apache.org>
> > mvdb 2002/12/12 07:40:37
> >
> > Modified: jelly/src/java/org/apache/commons/jelly/task JellyTask.java
> > Log:
> > Now using getLocation and getProject instead of directly referencing the
> protected instance. This instance will be deprecated in the next ant
> release, that's why it caught my eye.
>
> Cool, thanks!
>
> James
> -------
> http://radio.weblogs.com/0112098/
>
> >
> > Revision Changes Path
> > 1.11 +4 -4
> jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/task/JellyTa
> sk.java
> >
> > Index: JellyTask.java
> > ===================================================================
> > RCS file:
> /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/ta
> sk/JellyTask.java,v
> > retrieving revision 1.10
> > retrieving revision 1.11
> > diff -u -r1.10 -r1.11
> > --- JellyTask.java 11 Dec 2002 12:41:00 -0000 1.10
> > +++ JellyTask.java 12 Dec 2002 15:40:37 -0000 1.11
> > @@ -70,12 +70,12 @@
> >
> > Script script = compileScript();
> > JellyContext context = getJellyContext();
> > - context.setVariable( "project", project );
> > + context.setVariable( "project", getProject() );
> > script.run( context, getXMLOutput() );
> > getXMLOutput().flush();
> > }
> > catch (Exception e) {
> > - throw new BuildException(e, location);
> > + throw new BuildException(e, getLocation() );
> > }
> > }
> >
> > @@ -156,7 +156,7 @@
> > int idx = text.lastIndexOf('/');
> > text = text.substring(0, idx + 1);
> > JellyContext parentContext = new
> JellyContext(getRootContext(), new URL(text));
> > - context = new AntJellyContext(project, parentContext);
> > + context = new AntJellyContext(getProject() ,
> parentContext);
> >
> > // register the Ant tag library
> > context.registerTagLibrary( "jelly:ant", new
> AntTagLibrary() );
> > @@ -186,7 +186,7 @@
> > * @return the URL for the relative file name or absolute URL
> > */
> > protected URL resolveURL(String name) throws MalformedURLException
> {
> > - File file = project.resolveFile(name);
> > + File file = getProject().resolveFile(name);
> > if (file.exists()) {
> > return file.toURL();
> > }
> >
> >
> >
> >
> > --
> > To unsubscribe, e-mail:
> <ma...@jakarta.apache.org>
> > For additional commands, e-mail:
> <ma...@jakarta.apache.org>
> >
>
> __________________________________________________
> Do You Yahoo!?
> Everything you'll ever need on one web page
> from News and Sport to Email and Music Charts
> http://uk.my.yahoo.com
>
> --
> To unsubscribe, e-mail: <ma...@jakarta.apache.org>
> For additional commands, e-mail: <ma...@jakarta.apache.org>
>
>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>