You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/04/01 06:16:06 UTC
svn commit: r643271 - in
/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin: ./
pom.xml
src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java
Author: lu4242
Date: Mon Mar 31 21:15:56 2008
New Revision: 643271
URL: http://svn.apache.org/viewvc?rev=643271&view=rev
Log:
changed dependencies to make IOUtils.readModel work when used on goal execution
Modified:
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/ (props changed)
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/pom.xml
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java
Propchange: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 31 21:15:56 2008
@@ -0,0 +1,10 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings
+maven-eclipse.xml
+.externalToolBuilders
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/pom.xml?rev=643271&r1=643270&r2=643271&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/pom.xml (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/pom.xml Mon Mar 31 21:15:56 2008
@@ -89,6 +89,41 @@
</dependency>
<dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.0.b2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>6.5.3</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <!-- <scope>compile</scope> -->
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</version>
+ <!-- <scope>runtime</scope> -->
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java?rev=643271&r1=643270&r2=643271&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java Mon Mar 31 21:15:56 2008
@@ -27,6 +27,9 @@
import java.io.Reader;
import java.io.Writer;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
import org.apache.commons.digester.Digester;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.io.XmlWriter;
@@ -130,7 +133,13 @@
{
try
{
- Digester d = new Digester();
+ //Digester d = new Digester();
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ spf.setNamespaceAware(true);
+ // requires JAXP 1.3, in JavaSE 5.0
+ // spf.setXIncludeAware(true);
+ Digester d = new Digester(spf.newSAXParser());
+ d.setNamespaceAware(true);
Model.addXmlRules(d);
@@ -146,6 +155,11 @@
catch (SAXException e)
{
throw new MojoExecutionException("Unable to load metadata", e);
+ }
+ catch (ParserConfigurationException e)
+ {
+ // TODO Auto-generated catch block
+ throw new MojoExecutionException("Unable to load parser", e);
}
}
}