svn commit: r1532682 - in /myfaces/tobago/trunk/tobago-tool/tobago-tool-apt: pom.xml src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java

[lo...@apache.org]

Author: lofwyr
Date: Wed Oct 16 08:24:42 2013
New Revision: 1532682

URL: http://svn.apache.org/r1532682
Log:
update plexus

Modified:
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=1532682&r1=1532681&r2=1532682&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Wed Oct 16 08:24:42 2013
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.0.5</version>
+      <version>2.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java?rev=1532682&r1=1532681&r2=1532682&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java Wed Oct 16 08:24:42 2013
@@ -19,7 +19,6 @@
 
 package org.apache.myfaces.tobago.apt.processor;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.myfaces.tobago.apt.annotation.Converter;
 import org.apache.myfaces.tobago.apt.annotation.Facet;
@@ -28,6 +27,7 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.Validator;
 import org.apache.myfaces.tobago.apt.generate.ComponentInfo;
+import org.codehaus.plexus.util.FileUtils;
 import org.jdom.Attribute;
 import org.jdom.Comment;
 import org.jdom.Document;
@@ -43,7 +43,6 @@ import javax.lang.model.element.Executab
 import javax.lang.model.element.TypeElement;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
-import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -148,7 +147,7 @@ public class FacesConfigGenerator extend
     Document document;
     Writer writer = null;
     try {
-      String content = FileUtils.readFileToString(new File(sourceFacesConfigFile), "UTF-8");
+      String content = FileUtils.fileRead(sourceFacesConfigFile);
       SAXBuilder builder = new SAXBuilder();
       document = builder.build(new StringReader(content));