costin 2002/08/13 10:12:41
Modified: proposal/embed test.xml
proposal/embed/src/java/org/apache/tools/ant/helper
ProjectHelperImpl2.java
Added: proposal/embed/src/java/org/apache/tools/ant/types
XMLDOM.java
Log:
Check in 11644. Thanks Nicola.
XMLDOC is a typedes that can be used in the embed proposal.
It loads an xml file as a DOM, thus making it available to jxpath.
Note:
This is different from the XML task that loads each element
as a property. Eventually we should merge the 2 - after 'embed'
is proposed for the main branch and if it is accepted.
Note2: It would be interesting to explore the other side of
jxpath, i.e. setting. And then saving the xml file.
Revision Changes Path
1.3 +7 -0 jakarta-ant/proposal/embed/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/embed/test.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test.xml 27 Jul 2002 02:18:34 -0000 1.2
+++ test.xml 13 Aug 2002 17:12:40 -0000 1.3
@@ -31,6 +31,13 @@
<echo message="jxPath /[EMAIL PROTECTED]'myJars']: ${jxpath:/[EMAIL
PROTECTED]'myJars']}" />
<echo message="jxPath /references/myJars: ${jxpath:/references/myJars}"
/>
+ <!-- This is XMLDOM.java - a datatype that holds an xml DOM -->
+ <typedef name="xmldom" classname="org.apache.tools.ant.types.XMLDOM"/>
+
+ <!-- Init XMLDOM. The DOM of file test.xml will be referenced via the
id-->
+ <xmldom id="test.xml" file="test.xml"/>
+
+ <echo message="XMLDOM:
${jxpath:/references/test.xml/root/project/@name}" />
</target>
1.3 +5 -0
jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java
Index: ProjectHelperImpl2.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectHelperImpl2.java 27 Jul 2002 02:20:16 -0000 1.2
+++ ProjectHelperImpl2.java 13 Aug 2002 17:12:40 -0000 1.3
@@ -539,6 +539,11 @@
if (qname.equals("project")) {
return ProjectHelperImpl2.projectHandler;
} else {
+// if( context.importlevel > 0 ) {
+// // we are in an imported file. Allow top-level
<target>.
+// if( qname.equals( "target" ) )
+// return ProjectHelperImpl2.targetHandler;
+// }
throw new SAXParseException("Unexpected element \"" + qname
+ "\" " + name, context.locator);
}
}
1.1
jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/types/XMLDOM.java
Index: XMLDOM.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 [EMAIL PROTECTED]
*
* 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.types;
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.*;
import java.io.*;
import java.util.*;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
/**
* Loads an xml file as DOM in a DataType
*
* @author Nicola Ken Barozzi [EMAIL PROTECTED]
*/
public class XMLDOM extends DataType {
/** The name of this data type */
public static final String DATA_TYPE_NAME = "xmldom";
private File xmlfile = null;
private Document docRoot = null;
public XMLDOM() {
}
public void setFile(File xmlfile) {
this.xmlfile = xmlfile;
}
/***
* Gets the Document root of the DOM
* given project.
*/
public Document getRoot() {
if(docRoot==null){
try{
DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
//FIXME eventually set DocumentBuilderFactory properties in the
future
DocumentBuilder builder = factory.newDocumentBuilder();
//FIXME eventually set DocumentBuilder properties in the future
this.docRoot = builder.parse(xmlfile);
}
catch(ParserConfigurationException pce){
throw new BuildException("Error in the configuration of the
parser", pce);
}
catch(SAXException se){
throw new BuildException("Error during parsing", se);
}
catch(IOException ioe){
throw new BuildException("Can't load the specified file", ioe);
}
}
return docRoot;
}
/***
* Get the RegularExpression this reference refers to in
* the given project. Check for circular references too
*/
/*
public Substitution getRef(Project p) {
if (!isChecked()) {
Stack stk = new Stack();
stk.push(this);
dieOnCircularReference(stk, p);
}
Object o = getRefid().getReferencedObject(p);
if (!(o instanceof Substitution)) {
String msg = getRefid().getRefId() + " doesn\'t denote a
substitution";
throw new BuildException(msg);
} else {
return (Substitution) o;
}
}
*/
} //-- XMLDOM.java
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
