ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional JXPathSet.java JexlProperties.java VelocityProperties.java JXPath.java
Date Fri, 30 Aug 2002 23:11:02 GMT
costin      2002/08/30 16:11:02

  Modified:    proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional
                        JXPath.java
  Added:       proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional
                        JXPathSet.java JexlProperties.java
                        VelocityProperties.java
  Log:
  Added velocity and jexp dynamic properties.
  
  Started a bit of support for jxpath set.
  
  Revision  Changes    Path
  1.2       +4 -19     jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java
  
  Index: JXPath.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JXPath.java	27 Jul 2002 02:19:27 -0000	1.1
  +++ JXPath.java	30 Aug 2002 23:11:02 -0000	1.2
  @@ -59,22 +59,6 @@
   
   import java.io.*;
   import java.util.*;
  -import org.xml.sax.Locator;
  -import org.xml.sax.InputSource;
  -//import org.xml.sax.HandlerBase;
  -import org.xml.sax.SAXParseException;
  -import org.xml.sax.XMLReader;
  -import org.xml.sax.SAXException;
  -import org.xml.sax.DocumentHandler;
  -import org.xml.sax.Attributes;
  -import org.xml.sax.AttributeList;
  -import org.xml.sax.helpers.XMLReaderAdapter;
  -import org.xml.sax.helpers.DefaultHandler;
  -import org.xml.sax.helpers.AttributeListImpl;
  -
  -import javax.xml.parsers.SAXParserFactory;
  -import javax.xml.parsers.SAXParser;
  -import javax.xml.parsers.ParserConfigurationException;
   
   import org.apache.commons.jxpath.*;
   
  @@ -87,17 +71,18 @@
    * @author Costin Manolache
    */
   public class JXPath extends Task implements PropertyInterceptor {
  +
  +    public static String PREFIX="jxpath:";
       JXPathContext jxpathCtx;
       
       public JXPath() {
       }
       
       public Object getProperty( Project p, String ns, String name ) {
  -        if( ! name.startsWith("jxpath:" ) )
  +        if( ! name.startsWith(PREFIX) )
               return null;
  -        name=name.substring( 7 );
  +        name=name.substring( PREFIX.length() );
           Object o=jxpathCtx.getValue( name );
  -        //System.out.println("JXPath: getProperty " + ns + " " + name + "=" + o);
           if( o==null ) return "null";
           return o;
       }
  
  
  
  1.1                  jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPathSet.java
  
  Index: JXPathSet.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant.taskdefs.optional;
  
  import org.apache.tools.ant.*;
  import org.apache.tools.ant.types.*;
  
  import java.io.*;
  import java.util.*;
  
  import org.apache.commons.jxpath.*;
  
  
  /**
   *  Set a JXPath property
   *  
   *
   * @author Costin Manolache
   */
  public class JXPathSet extends Task {
  
      JXPathContext jxpathCtx;
      String path;
      String value;
      String refId;
      
      
      public JXPathSet() {
      }
  
      /** The JXPath pointing to the target.
       *  The root of the tree is the Project.
       *  Example:
       *      /references[@name='myRef']
       *
       */
      public void setPath( String path ) {
          this.path=path;
      }
  
      /** The value will be the referenced object.
       */
      public void setRefId( String refId ) {
          this.refId=refId;
      }
  
      /** Set the value to be used.
       */
      public void setValue( String s ) {
          this.value=s;
      }
  
      public void execute() {
          jxpathCtx=JXPathContext.newContext( project );
  
          
      }    
  }
  
  
  
  1.1                  jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java
  
  Index: JexlProperties.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant.taskdefs.optional;
  
  import org.apache.tools.ant.*;
  import org.apache.tools.ant.types.*;
  import java.io.*;
  import java.util.*;
  
  import org.apache.commons.jexl.*;
  
  /**
   *  Enable JEXL dynamic properties
   *  
   *
   * @author Costin Manolache
   */
  public class JexlProperties extends Task implements PropertyInterceptor {
      JexlContext jc;
      public static String PREFIX="jexl:";
      
      public JexlProperties() {
      }
      
      public Object getProperty( Project p, String ns, String name ) {
          if( ! name.startsWith(PREFIX) )
              return null;
          try {
              name=name.substring( PREFIX.length() );
              Expression e = ExpressionFactory.createExpression(name);
              Object o = e.evaluate(jc);
  
              return o;
          } catch( Exception ex ) {
              ex.printStackTrace();
              return null;
          }
      }
      
      
      public void execute() {
          PropertyHelper phelper=PropertyHelper.getPropertyHelper( project );
          phelper.addPropertyInterceptor( this );
  
          /*
           *  First make a jexlContext and put stuff in it
           */
          jc = JexlHelper.createContext();
  
          jc.getVars().put("ant", project);
  
      }    
  }
  
  
  
  1.1                  jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java
  
  Index: VelocityProperties.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant.taskdefs.optional;
  
  import org.apache.tools.ant.*;
  import org.apache.tools.ant.types.*;
  import java.io.*;
  import java.util.*;
  
  import org.apache.velocity.app.VelocityEngine;
  import org.apache.velocity.VelocityContext;
  import org.apache.velocity.Template;
  
  /**
   *  Enable Velocity dynamic properties
   *  
   *
   * @author Costin Manolache
   */
  public class VelocityProperties extends Task implements PropertyInterceptor {
      VelocityEngine engine;
      VelocityContext context;
      public static final String PREFIX="vm:";
      
      public VelocityProperties() {
      }
      
      public Object getProperty( Project p, String ns, String name ) {
          if( ! name.startsWith(PREFIX) )
              return null;
          try {
              name=name.substring( PREFIX.length() );
              StringWriter sw=new StringWriter();
              
              engine.evaluate( context, sw, "antVM", name );
              
              System.out.println("VM: getProperty " + ns + " " + name + "=" + sw.toString());
              return sw.toString();
          } catch( Exception ex ) {
              ex.printStackTrace();
              return null;
          }
      }
      
      
      public void execute() {
          try {
              PropertyHelper phelper=PropertyHelper.getPropertyHelper( project );
              phelper.addPropertyInterceptor( this );
              
              engine=new VelocityEngine();
              engine.init();
              
              context=new VelocityContext();
              context.put( "ant", project );
          } catch( Exception ex ) {
              ex.printStackTrace();
          }
  
      }    
  }
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message