jvanzyl 02/05/30 09:45:00
Modified: src/java/org/apache/maven/transformer SourceTransformer.java
Log:
Getting rid of the xo references, sorry about that.
Revision Changes Path
1.6 +9 -10
jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java
Index: SourceTransformer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SourceTransformer.java 9 May 2002 01:58:27 -0000 1.5
+++ SourceTransformer.java 30 May 2002 16:45:00 -0000 1.6
@@ -58,16 +58,21 @@
import java.io.FileWriter;
import java.util.Iterator;
+import org.apache.commons.betwixt.io.BeanReader;
+
+import org.apache.maven.MavenUtils;
+
import org.apache.oro.text.perl.Perl5Util;
-import org.apache.commons.xo.Mapper;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
+
import org.apache.velocity.util.StringUtils;
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: SourceTransformer.java,v 1.5 2002/05/09 01:58:27 brekke Exp $
+ * @version $Id: SourceTransformer.java,v 1.6 2002/05/30 16:45:00 jvanzyl Exp $
* @todo Get fileContentsToString() in the commons and break vel dep.
*/
public class SourceTransformer
@@ -112,9 +117,6 @@
*/
private File descriptor;
- private final static String instructionsClass =
- "org.apache.maven.transformer.Instructions";
-
/**
* Set the source directory.
*
@@ -181,13 +183,10 @@
"The specified srcDir does not exist: " + srcDir);
}
- // Retrieve the transformations to perform on source files.
- Mapper mapper = new Mapper();
-
try
{
- instructions =
- (Instructions) mapper.map(descriptor, instructionsClass);
+ BeanReader reader = MavenUtils.createBeanReader(Instructions.class);
+ instructions = (Instructions) reader.parse(descriptor);
}
catch (Exception e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
