You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2002/12/02 00:26:11 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven MavenUtils.java
dion 2002/12/01 15:26:10
Modified: src/java/org/apache/maven/jelly JellyUtils.java
src/java/org/apache/maven MavenUtils.java
Log:
Remove Piccolo specific code
Revision Changes Path
1.6 +3 -3 jakarta-turbine-maven/src/java/org/apache/maven/jelly/JellyUtils.java
Index: JellyUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/JellyUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JellyUtils.java 25 Nov 2002 00:47:37 -0000 1.5
+++ JellyUtils.java 1 Dec 2002 23:26:10 -0000 1.6
@@ -56,7 +56,6 @@
* ====================================================================
*/
-import com.bluecast.xml.JAXPSAXParserFactory;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
@@ -190,7 +189,8 @@
String encoding )
throws Exception
{
- SAXParserFactory factory = new JAXPSAXParserFactory();
+ // FIXME: This should all be done by Jelly.
+ SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setNamespaceAware( true );
XMLReader reader = factory.newSAXParser().getXMLReader();
XMLParser parser = new XMLParser( reader );
1.71 +1 -2 jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- MavenUtils.java 30 Nov 2002 17:18:25 -0000 1.70
+++ MavenUtils.java 1 Dec 2002 23:26:10 -0000 1.71
@@ -56,7 +56,6 @@
* ====================================================================
*/
-import com.bluecast.xml.JAXPSAXParserFactory;
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanReader;
import org.apache.commons.betwixt.io.BeanWriter;
@@ -483,7 +482,7 @@
private static XMLReader createXMLReader()
throws Exception
{
- SAXParserFactory factory = new JAXPSAXParserFactory();
+ SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setNamespaceAware( true );