You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tdk-dev@turbine.apache.org by jv...@apache.org on 2002/02/08 23:34:46 UTC
cvs commit: jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/transformer SourceTransformer.java transformations.xml
jvanzyl 02/02/08 14:34:46
Modified: src/tdk/task/org/apache/tdk/transformer
SourceTransformer.java transformations.xml
Log:
- using the mapper instead of the digester for the source transformer.
Revision Changes Path
1.3 +11 -8 jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/transformer/SourceTransformer.java
Index: SourceTransformer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/transformer/SourceTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceTransformer.java 21 Oct 2001 21:46:20 -0000 1.2
+++ SourceTransformer.java 8 Feb 2002 22:34:46 -0000 1.3
@@ -63,11 +63,12 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
+import org.apache.stratum.xo.Mapper;
/**
* @author <a href="mailto:jvanzyl@zenplex.com">Jason van Zyl</a>
*
- * @version $Id: SourceTransformer.java,v 1.2 2001/10/21 21:46:20 jvanzyl Exp $
+ * @version $Id: SourceTransformer.java,v 1.3 2002/02/08 22:34:46 jvanzyl Exp $
*/
public class SourceTransformer
extends Task
@@ -91,7 +92,7 @@
* Transformations that the source files
* must undergoe.
*/
- protected Transformations transformations;
+ protected Instructions instructions;
/**
* Directory of source files that need to be
@@ -110,7 +111,10 @@
* and results.
*/
private File descriptor;
-
+
+ private final static String instructionsClass =
+ "org.apache.tdk.task.transformer.Instructions";
+
/**
* Set the source directory.
*
@@ -178,11 +182,12 @@
}
// Retrieve the transformations to perform on source files.
- TransformationsDigester td = new TransformationsDigester();
+ Mapper mapper = new Mapper();
try
{
- transformations = (Transformations) td.parse(descriptor);
+ Instructions instructions =
+ (Instructions) mapper.map(descriptor, instructionsClass);
}
catch (Exception e)
{
@@ -251,9 +256,7 @@
{
originalSourceFile = StringUtils.fileContentsToString(sourceFile);
perl = new Perl5Util();
- Iterator i = transformations.getTransformations().iterator();
-
- System.out.println(transformations.getTransformations().size());
+ Iterator i = instructions.getTransformations().iterator();
while (i.hasNext())
{
1.6 +200 -197 jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/transformer/transformations.xml
Index: transformations.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/transformer/transformations.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- transformations.xml 23 Oct 2001 15:35:07 -0000 1.5
+++ transformations.xml 8 Feb 2002 22:34:46 -0000 1.6
@@ -1,4 +1,4 @@
-<transformations>
+<instructions>
<description>
These transformations provide a path of migration from
@@ -7,205 +7,208 @@
<!-- Classes that have been made a part of the Turbine
interface for now. -->
+
+ <transformations>
- <transformation>
- <target>import org.apache.turbine.util.RunData</target>
- <result>import org.apache.turbine.RunData</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.ParameterParser</target>
- <result>import org.apache.turbine.ParameterParser</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.DynamicURI</target>
- <result>import org.apache.turbine.DynamicURI</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.RelativeDynamicURI</target>
- <result>import org.apache.turbine.RelativeDynamicURI</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.Log</target>
- <result>import org.apache.turbine.Log</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.TurbineConfig</target>
- <result>import org.apache.turbine.TurbineConfig</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.TurbineException</target>
- <result>import org.apache.turbine.TurbineException</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.TurbineRuntimeException</target>
- <result>import org.apache.turbine.TurbineRuntimeException</result>
- </transformation>
-
- <!-- Commons Utils Separation -->
-
- <transformation>
- <target>import org.apache.turbine.util.HttpUtils</target>
- <result>import org.apache.commons.util.http.HttpUtils</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.BrowserDetector</target>
- <result>import org.apache.commons.util.http.BrowserDetector</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.BufferCache</target>
- <result>import org.apache.commons.util.BufferCache</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.FileUtils</target>
- <result>import org.apache.commons.util.FileUtils</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.GenerateUniqueId</target>
- <result>import org.apache.commons.util.GenerateUniqueId</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.ObjectUtils</target>
- <result>import org.apache.commons.util.ObjectUtils</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.SequencedHashtable</target>
- <result>import org.apache.commons.util.SequencedHashtable</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.StringStack</target>
- <result>import org.apache.commons.util.StringStack</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.StringUtils</target>
- <result>import org.apache.commons.util.StringUtils</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.ContentURI</target>
- <result>import org.apache.turbine.tool.ContentURI</result>
- </transformation>
-
- <!-- Commons Mail Separation -->
-
- <!-- Take care of all the imports for the separated mail package -->
- <transformation>
- <target>import org.apache.turbine.util.mail</target>
- <result>import org.apache.commons.mail</result>
- </transformation>
-
- <!-- Fulcrum Separation -->
-
- <!-- Take care of all imports for the separated parser package -->
- <transformation>
- <target>import org.apache.turbine.util.parser</target>
- <result>import org.apache.fulcrum.util.parser</result>
- </transformation>
-
- <!-- Take care of all imports for the separated pool package -->
- <transformation>
- <target>import org.apache.turbine.util.pool</target>
- <result>import org.apache.fulcrum.pool</result>
- </transformation>
-
- <!-- Take care of all imports for the separated security package -->
- <transformation>
- <target>import org.apache.turbine.util.security</target>
- <result>import org.apache.fulcrum.security.util</result>
- </transformation>
-
- <!-- Conversion of util.velocity package -->
- <transformation>
- <target>import org.apache.turbine.util.velocity.VelocityEmail</target>
- <result>import org.apache.fulcrum.template.mail.TemplateEmail</result>
- </transformation>
-
- <!-- Need to change the class name in source files as well -->
- <transformation>
- <target>VelocityEmail</target>
- <result>TemplateEmail</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.velocity.VelocityHtmlEmail</target>
- <result>import org.apache.fulcrum.template.mail.TemplateHtmlEmail</result>
- </transformation>
-
- <!-- Need to change the class name in source files as well -->
- <transformation>
- <target>VelocityHtmlEmail</target>
- <result>TemplateHtmlEmail</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.velocity.VelocityAction</target>
- <result>import org.apache.turbine.TemplateAction</result>
- </transformation>
-
- <!-- Need to change the class name in source files as well -->
- <transformation>
- <target>VelocityActionEvent</target>
- <result>TemplateAction</result>
- </transformation>
-
- <!-- These are all pull tools but who knows how people are
- using them -->
-
- <transformation>
- <target>import org.apache.turbine.util.template.RelativeTemplateLink</target>
- <result>import org.apache.turbine.tool.RelativeTemplateLink</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.template.TemplateLink</target>
- <result>import org.apache.turbine.tool.TemplateLink</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.template.TemplateLinkWithSlash</target>
- <result>import org.apache.turbine.tool.TemplateLinkWithSlash</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.template.TemplatePageAttributes</target>
- <result>import org.apache.turbine.tool.TemplatePageAttributes</result>
- </transformation>
-
- <!-- Take care of all imports for the separated upload package -->
- <transformation>
- <target>import org.apache.turbine.util.upload</target>
- <result>import org.apache.fulcrum.upload</result>
- </transformation>
-
- <!-- Torque Separation -->
-
- <transformation>
- <target>import org.apache.turbine.util.db.Criteria</target>
- <result>import org.apache.torque.util.Criteria</result>
- </transformation>
-
- <transformation>
- <target>import org.apache.turbine.util.db.pool.DBConnection</target>
- <result>import org.apache.torque.pool.DBConnection</result>
- </transformation>
+ <transformation>
+ <target>import org.apache.turbine.util.RunData</target>
+ <result>import org.apache.turbine.RunData</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.ParameterParser</target>
+ <result>import org.apache.turbine.ParameterParser</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.DynamicURI</target>
+ <result>import org.apache.turbine.DynamicURI</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.RelativeDynamicURI</target>
+ <result>import org.apache.turbine.RelativeDynamicURI</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.Log</target>
+ <result>import org.apache.turbine.Log</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.TurbineConfig</target>
+ <result>import org.apache.turbine.TurbineConfig</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.TurbineException</target>
+ <result>import org.apache.turbine.TurbineException</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.TurbineRuntimeException</target>
+ <result>import org.apache.turbine.TurbineRuntimeException</result>
+ </transformation>
+
+ <!-- Commons Utils Separation -->
+
+ <transformation>
+ <target>import org.apache.turbine.util.HttpUtils</target>
+ <result>import org.apache.commons.util.http.HttpUtils</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.BrowserDetector</target>
+ <result>import org.apache.commons.util.http.BrowserDetector</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.BufferCache</target>
+ <result>import org.apache.commons.util.BufferCache</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.FileUtils</target>
+ <result>import org.apache.commons.util.FileUtils</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.GenerateUniqueId</target>
+ <result>import org.apache.commons.util.GenerateUniqueId</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.ObjectUtils</target>
+ <result>import org.apache.commons.util.ObjectUtils</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.SequencedHashtable</target>
+ <result>import org.apache.commons.util.SequencedHashtable</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.StringStack</target>
+ <result>import org.apache.commons.util.StringStack</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.StringUtils</target>
+ <result>import org.apache.commons.util.StringUtils</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.ContentURI</target>
+ <result>import org.apache.turbine.tool.ContentURI</result>
+ </transformation>
+
+ <!-- Commons Mail Separation -->
+
+ <!-- Take care of all the imports for the separated mail package -->
+ <transformation>
+ <target>import org.apache.turbine.util.mail</target>
+ <result>import org.apache.commons.mail</result>
+ </transformation>
- <!-- Turbine Services -->
+ <!-- Fulcrum Separation -->
+
+ <!-- Take care of all imports for the separated parser package -->
+ <transformation>
+ <target>import org.apache.turbine.util.parser</target>
+ <result>import org.apache.fulcrum.util.parser</result>
+ </transformation>
+
+ <!-- Take care of all imports for the separated pool package -->
+ <transformation>
+ <target>import org.apache.turbine.util.pool</target>
+ <result>import org.apache.fulcrum.pool</result>
+ </transformation>
+
+ <!-- Take care of all imports for the separated security package -->
+ <transformation>
+ <target>import org.apache.turbine.util.security</target>
+ <result>import org.apache.fulcrum.security.util</result>
+ </transformation>
+
+ <!-- Conversion of util.velocity package -->
+ <transformation>
+ <target>import org.apache.turbine.util.velocity.VelocityEmail</target>
+ <result>import org.apache.fulcrum.template.mail.TemplateEmail</result>
+ </transformation>
+
+ <!-- Need to change the class name in source files as well -->
+ <transformation>
+ <target>VelocityEmail</target>
+ <result>TemplateEmail</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.velocity.VelocityHtmlEmail</target>
+ <result>import org.apache.fulcrum.template.mail.TemplateHtmlEmail</result>
+ </transformation>
+
+ <!-- Need to change the class name in source files as well -->
+ <transformation>
+ <target>VelocityHtmlEmail</target>
+ <result>TemplateHtmlEmail</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.velocity.VelocityAction</target>
+ <result>import org.apache.turbine.TemplateAction</result>
+ </transformation>
+
+ <!-- Need to change the class name in source files as well -->
+ <transformation>
+ <target>VelocityActionEvent</target>
+ <result>TemplateAction</result>
+ </transformation>
+
+ <!-- These are all pull tools but who knows how people are
+ using them -->
+
+ <transformation>
+ <target>import org.apache.turbine.util.template.RelativeTemplateLink</target>
+ <result>import org.apache.turbine.tool.RelativeTemplateLink</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.template.TemplateLink</target>
+ <result>import org.apache.turbine.tool.TemplateLink</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.template.TemplateLinkWithSlash</target>
+ <result>import org.apache.turbine.tool.TemplateLinkWithSlash</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.template.TemplatePageAttributes</target>
+ <result>import org.apache.turbine.tool.TemplatePageAttributes</result>
+ </transformation>
+
+ <!-- Take care of all imports for the separated upload package -->
+ <transformation>
+ <target>import org.apache.turbine.util.upload</target>
+ <result>import org.apache.fulcrum.upload</result>
+ </transformation>
+ <!-- Torque Separation -->
+
+ <transformation>
+ <target>import org.apache.turbine.util.db.Criteria</target>
+ <result>import org.apache.torque.util.Criteria</result>
+ </transformation>
+
+ <transformation>
+ <target>import org.apache.turbine.util.db.pool.DBConnection</target>
+ <result>import org.apache.torque.pool.DBConnection</result>
+ </transformation>
+
+ </transformations>
+
+ <!-- Turbine Services -->
<!-- Turbine Security Service Extensions -->
-</transformations>
+<instructions>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>