Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 42785 invoked from network); 11 Oct 2002 18:07:17 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 11 Oct 2002 18:07:17 -0000 Received: (qmail 4183 invoked by uid 97); 11 Oct 2002 18:08:03 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 4093 invoked by uid 97); 11 Oct 2002 18:08:02 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 4082 invoked by uid 97); 11 Oct 2002 18:08:02 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 11 Oct 2002 18:07:08 -0000 Message-ID: <20021011180708.49807.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional JXPath.java JXPathSet.java JexlProperties.java VelocityProperties.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin 2002/10/11 11:07:08 Modified: proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional JXPath.java JXPathSet.java JexlProperties.java VelocityProperties.java Log: Various fixes Revision Changes Path 1.4 +22 -2 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JXPath.java 30 Aug 2002 23:27:36 -0000 1.3 +++ JXPath.java 11 Oct 2002 18:07:08 -0000 1.4 @@ -77,8 +77,16 @@ public JXPath() { } + + public JXPathContext getJXPathContext() { + return jxpathCtx; + } - public Object getProperty( Project p, String ns, String name ) { + public boolean setProperty( Object c, String ns, String name, Object v ) { + return false; + } + + public Object getProperty( Object p, String ns, String name ) { if( ! name.startsWith(PREFIX) ) return null; name=name.substring( PREFIX.length() ); @@ -105,13 +113,25 @@ return result; } - + + // testing + String foo; + public void setFoo( String s ) { + System.out.println("Set foo " + s ); + foo=s; + } + + public String getFoo() { + return foo; + } public void execute() { JXPathIntrospector.registerDynamicClass(Hashtable.class, JXPathHashtableHandler.class); PropertyHelper phelper=PropertyHelper.getPropertyHelper( project ); phelper.addPropertyInterceptor( this ); + + project.addReference( "jxpathTask", this ); jxpathCtx=JXPathContext.newContext( project ); 1.2 +11 -5 jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPathSet.java Index: JXPathSet.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPathSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JXPathSet.java 30 Aug 2002 23:11:02 -0000 1.1 +++ JXPathSet.java 11 Oct 2002 18:07:08 -0000 1.2 @@ -71,12 +71,10 @@ */ public class JXPathSet extends Task { - JXPathContext jxpathCtx; String path; - String value; + String valueString; String refId; - public JXPathSet() { } @@ -99,12 +97,20 @@ /** Set the value to be used. */ public void setValue( String s ) { - this.value=s; + this.valueString=s; } public void execute() { - jxpathCtx=JXPathContext.newContext( project ); + JXPathContext jxpathCtx; + JXPath jxpathTask=(JXPath)project.getReference( "jxpathTask" ); + jxpathCtx=jxpathTask.getJXPathContext(); + Object value=null; + if( refId!=null ) + value=project.getReference( refId ); + if( value==null ) + value=valueString; + jxpathCtx.setValue( path, value ); } } 1.2 +5 -1 jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java Index: JexlProperties.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JexlProperties.java 30 Aug 2002 23:11:02 -0000 1.1 +++ JexlProperties.java 11 Oct 2002 18:07:08 -0000 1.2 @@ -74,7 +74,11 @@ public JexlProperties() { } - public Object getProperty( Project p, String ns, String name ) { + public boolean setProperty( Object ctx, String ns, String name, Object value ) { + return false; + } + + public Object getProperty( Object p, String ns, String name ) { if( ! name.startsWith(PREFIX) ) return null; try { 1.2 +10 -3 jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java Index: VelocityProperties.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VelocityProperties.java 30 Aug 2002 23:11:02 -0000 1.1 +++ VelocityProperties.java 11 Oct 2002 18:07:08 -0000 1.2 @@ -76,8 +76,12 @@ public VelocityProperties() { } + + public boolean setProperty( Object c, String ns, String name, Object v ) { + return false; + } - public Object getProperty( Project p, String ns, String name ) { + public Object getProperty( Object p, String ns, String name ) { if( ! name.startsWith(PREFIX) ) return null; try { @@ -93,13 +97,16 @@ return null; } } - + + public VelocityEngine getVelocityEngine() { + return engine; + } public void execute() { try { PropertyHelper phelper=PropertyHelper.getPropertyHelper( project ); phelper.addPropertyInterceptor( this ); - + engine=new VelocityEngine(); engine.init(); -- To unsubscribe, e-mail: For additional commands, e-mail: