You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2011/07/01 09:25:33 UTC
svn commit: r1141848 - in
/tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src:
main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java
test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
Author: apetrelli
Date: Fri Jul 1 07:25:33 2011
New Revision: 1141848
URL: http://svn.apache.org/viewvc?rev=1141848&view=rev
Log:
AUTOTAG-13
Using workaround to force enhanced mode for XStream for all JVM.
Modified:
tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java
tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
Modified: tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java?rev=1141848&r1=1141847&r2=1141848&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java (original)
+++ tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojo.java Fri Jul 1 07:25:33 2011
@@ -40,6 +40,7 @@ import org.apache.tiles.autotag.model.Te
import org.apache.velocity.app.VelocityEngine;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.Sun14ReflectionProvider;
/**
* Abstract class to generate boilerplate code starting from template model classes.
@@ -95,7 +96,7 @@ public abstract class AbstractGenerateMo
public void execute() throws MojoExecutionException {
try {
InputStream stream = findTemplateSuiteDescriptor();
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new Sun14ReflectionProvider());
TemplateSuite suite = (TemplateSuite) xstream.fromXML(stream);
stream.close();
Modified: tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java?rev=1141848&r1=1141847&r2=1141848&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java (original)
+++ tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java Fri Jul 1 07:25:33 2011
@@ -47,6 +47,7 @@ import org.apache.tiles.request.Request;
import org.junit.Test;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.reflection.Sun14ReflectionProvider;
/**
* Tests {@link CreateDescriptorMojo}.
@@ -79,7 +80,7 @@ public class CreateDescriptorMojoTest {
replay(mavenProject);
mojo.execute();
InputStream sis = new FileInputStream(new File(temp, "META-INF/template-suite.xml"));
- XStream xstream = new XStream();
+ XStream xstream = new XStream(new Sun14ReflectionProvider());
TemplateSuite suite = (TemplateSuite) xstream.fromXML(sis);
sis.close();
assertEquals("test", suite.getName());