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 2010/02/27 19:04:25 UTC
svn commit: r917001 - in /tiles/sandbox/trunk/tiles-autotag:
tiles-autotag-core/
tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/
tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/
tiles-autotag-jsp/ tiles-autotag-jsp/sr...
Author: apetrelli
Date: Sat Feb 27 18:04:25 2010
New Revision: 917001
URL: http://svn.apache.org/viewvc?rev=917001&view=rev
Log:
TILESSB-22
Extrapolated abstract classes.
Allowed the use of multi-line documentation.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java (with props)
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java (with props)
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/StringTool.java (with props)
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/pom.xml
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TLDGenerator.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TagClassGenerator.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TLDGeneratorTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TagClassGeneratorTest.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/pom.xml?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/pom.xml Sat Feb 27 18:04:25 2010
@@ -41,15 +41,20 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.5.2</version>
- <scope>test</scope>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.5.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-autotag-core-runtime</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core-runtime</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.6.3</version>
</dependency>
</dependencies>
</project>
Added: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java?rev=917001&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java (added)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java Sat Feb 27 18:04:25 2010
@@ -0,0 +1,65 @@
+package org.apache.tiles.autotag.generate;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.Writer;
+
+import org.apache.tiles.autotag.core.AutotagRuntimeException;
+import org.apache.tiles.autotag.model.TemplateClass;
+import org.apache.tiles.autotag.model.TemplateSuite;
+import org.apache.tiles.autotag.tool.StringTool;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+
+public abstract class AbstractTemplateClassGenerator implements
+ TemplateClassGenerator {
+
+ @Override
+ public void generate(File directory, String packageName,
+ TemplateSuite suite, TemplateClass clazz) {
+ File dir = new File(directory, getDirectoryName(directory, packageName,
+ suite, clazz));
+ dir.mkdirs();
+ File file = new File(dir, getFilename(dir, packageName, suite, clazz));
+ VelocityContext context = new VelocityContext();
+ context.put("packageName", packageName);
+ context.put("suite", suite);
+ context.put("clazz", clazz);
+ context.put("stringTool", new StringTool());
+ try {
+ file.createNewFile();
+ Template template = Velocity.getTemplate(getTemplatePath(dir,
+ packageName, suite, clazz));
+ Writer writer = new FileWriter(file);
+ try {
+ template.merge(context, writer);
+ } finally {
+ writer.close();
+ }
+ } catch (ResourceNotFoundException e) {
+ throw new AutotagRuntimeException("Cannot find template resource",
+ e);
+ } catch (ParseErrorException e) {
+ throw new AutotagRuntimeException(
+ "The template resource is not parseable", e);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new AutotagRuntimeException(
+ "Another generic exception while parsing the template resource",
+ e);
+ }
+ }
+
+ protected abstract String getTemplatePath(File directory,
+ String packageName, TemplateSuite suite, TemplateClass clazz);
+
+ protected abstract String getFilename(File directory, String packageName,
+ TemplateSuite suite, TemplateClass clazz);
+
+ protected abstract String getDirectoryName(File directory,
+ String packageName, TemplateSuite suite, TemplateClass clazz);
+}
Propchange: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java?rev=917001&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java (added)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java Sat Feb 27 18:04:25 2010
@@ -0,0 +1,55 @@
+package org.apache.tiles.autotag.generate;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.Writer;
+
+import org.apache.tiles.autotag.core.AutotagRuntimeException;
+import org.apache.tiles.autotag.model.TemplateSuite;
+import org.apache.tiles.autotag.tool.StringTool;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+
+public abstract class AbstractTemplateSuiteGenerator implements TemplateSuiteGenerator {
+
+ @Override
+ public void generate(File directory, String packageName, TemplateSuite suite) {
+ File dir = new File(directory, getDirectoryName(directory, packageName, suite));
+ dir.mkdirs();
+ File file = new File(dir, getFilename(dir, packageName, suite));
+ VelocityContext context = new VelocityContext();
+ context.put("packageName", packageName);
+ context.put("suite", suite);
+ context.put("stringTool", new StringTool());
+ try {
+ file.createNewFile();
+ Template template = Velocity.getTemplate(getTemplatePath(dir,
+ packageName, suite));
+ Writer writer = new FileWriter(file);
+ try {
+ template.merge(context, writer);
+ } finally {
+ writer.close();
+ }
+ } catch (ResourceNotFoundException e) {
+ throw new AutotagRuntimeException("Cannot find template resource", e);
+ } catch (ParseErrorException e) {
+ throw new AutotagRuntimeException("The template resource is not parseable", e);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new AutotagRuntimeException(
+ "Another generic exception while parsing the template resource",
+ e);
+ }
+ }
+
+ protected abstract String getTemplatePath(File directory, String packageName, TemplateSuite suite);
+
+ protected abstract String getFilename(File directory, String packageName, TemplateSuite suite);
+
+ protected abstract String getDirectoryName(File directory, String packageName, TemplateSuite suite);
+}
Propchange: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/StringTool.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/StringTool.java?rev=917001&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/StringTool.java (added)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/StringTool.java Sat Feb 27 18:04:25 2010
@@ -0,0 +1,29 @@
+package org.apache.tiles.autotag.tool;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tiles.autotag.core.AutotagRuntimeException;
+
+public class StringTool {
+
+ public List<String> splitOnNewlines(String toSplit) {
+ List<String> retValue = new ArrayList<String>();
+ Reader reader = new StringReader(toSplit);
+ BufferedReader bufReader = new BufferedReader(reader);
+ try {
+ String line;
+ while((line = bufReader.readLine()) != null) {
+ retValue.add(line);
+ }
+ } catch (IOException e) {
+ throw new AutotagRuntimeException(
+ "Cannot read the string completely", e);
+ }
+ return retValue;
+ }
+}
Propchange: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/StringTool.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/tool/StringTool.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml Sat Feb 27 18:04:25 2010
@@ -18,26 +18,21 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-autotag-core</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-autotag-core</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.6.3</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- <scope>test</scope>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TLDGenerator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TLDGenerator.java?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TLDGenerator.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TLDGenerator.java Sat Feb 27 18:04:25 2010
@@ -1,46 +1,22 @@
package org.apache.tiles.autotag.jsp;
import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-import org.apache.tiles.autotag.core.AutotagRuntimeException;
-import org.apache.tiles.autotag.generate.TemplateSuiteGenerator;
+import org.apache.tiles.autotag.generate.AbstractTemplateSuiteGenerator;
import org.apache.tiles.autotag.model.TemplateSuite;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
-
-public class TLDGenerator implements TemplateSuiteGenerator {
-
- @Override
- public void generate(File directory, String packageName, TemplateSuite suite) {
- File dir = new File(directory, "META-INF/tld/");
- dir.mkdirs();
- File tldFile = new File(dir, suite.getName() + "-jsp.tld");
- VelocityContext context = new VelocityContext();
- context.put("packageName", packageName);
- context.put("suite", suite);
- try {
- tldFile.createNewFile();
- Template template = Velocity.getTemplate("/org/apache/tiles/autotag/jsp/tld.vm");
- Writer writer = new FileWriter(tldFile);
- try {
- template.merge(context, writer);
- } finally {
- writer.close();
- }
- } catch (ResourceNotFoundException e) {
- throw new AutotagRuntimeException("Cannot get tld.vm resource", e);
- } catch (ParseErrorException e) {
- throw new AutotagRuntimeException("The tld.vm resource is not parseable", e);
- } catch (RuntimeException e) {
- throw e;
- } catch (Exception e) {
- throw new AutotagRuntimeException("Another generic exception while parsing tld.vm", e);
- }
+
+public class TLDGenerator extends AbstractTemplateSuiteGenerator {
+
+ protected String getTemplatePath(File directory, String packageName, TemplateSuite suite) {
+ return "/org/apache/tiles/autotag/jsp/tld.vm";
+ }
+
+ protected String getFilename(File directory, String packageName, TemplateSuite suite) {
+ return suite.getName() + "-jsp.tld";
+ }
+
+ protected String getDirectoryName(File directory, String packageName, TemplateSuite suite) {
+ return "META-INF/tld/";
}
}
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TagClassGenerator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TagClassGenerator.java?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TagClassGenerator.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/java/org/apache/tiles/autotag/jsp/TagClassGenerator.java Sat Feb 27 18:04:25 2010
@@ -1,48 +1,28 @@
package org.apache.tiles.autotag.jsp;
import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-import org.apache.tiles.autotag.core.AutotagRuntimeException;
-import org.apache.tiles.autotag.generate.TemplateClassGenerator;
+import org.apache.tiles.autotag.generate.AbstractTemplateClassGenerator;
import org.apache.tiles.autotag.model.TemplateClass;
import org.apache.tiles.autotag.model.TemplateSuite;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
-public class TagClassGenerator implements TemplateClassGenerator {
+public class TagClassGenerator extends AbstractTemplateClassGenerator {
@Override
- public void generate(File directory, String packageName,
+ protected String getDirectoryName(File directory, String packageName,
TemplateSuite suite, TemplateClass clazz) {
- File dir = new File(directory, packageName.replaceAll("\\.", "/"));
- dir.mkdirs();
- File javaFile = new File(dir, clazz.getTagClassPrefix() + "Tag.java");
- VelocityContext context = new VelocityContext();
- context.put("packageName", packageName);
- context.put("suite", suite);
- context.put("clazz", clazz);
- try {
- javaFile.createNewFile();
- Template template = Velocity.getTemplate("/org/apache/tiles/autotag/jsp/bodyTag.vm");
- Writer writer = new FileWriter(javaFile);
- try {
- template.merge(context, writer);
- } finally {
- writer.close();
- }
- } catch (ResourceNotFoundException e) {
- throw new AutotagRuntimeException("Cannot get bodyTag.vm resource", e);
- } catch (ParseErrorException e) {
- throw new AutotagRuntimeException("The tld.vm resource is not parseable", e);
- } catch (RuntimeException e) {
- throw e;
- } catch (Exception e) {
- throw new AutotagRuntimeException("Another generic exception while parsing tld.vm", e);
- }
+ return packageName.replaceAll("\\.", "/");
+ }
+
+ @Override
+ protected String getFilename(File directory, String packageName,
+ TemplateSuite suite, TemplateClass clazz) {
+ return clazz.getTagClassPrefix() + "Tag.java";
+ }
+
+ @Override
+ protected String getTemplatePath(File directory, String packageName,
+ TemplateSuite suite, TemplateClass clazz) {
+ return "/org/apache/tiles/autotag/jsp/bodyTag.vm";
}
}
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm Sat Feb 27 18:04:25 2010
@@ -25,7 +25,9 @@
import org.apache.tiles.request.Request;
/**
- * ${clazz.documentation}
+#foreach($line in $stringTool.splitOnNewlines(${clazz.documentation}))
+ * ${line}
+#end
*/
public class ${clazz.tagClassPrefix}Tag extends Body#if(!${clazz.hasBody()})less#{end}Tag {
@@ -36,7 +38,9 @@
#foreach($parameter in ${clazz.parameters})
/**
- * ${parameter.documentation}
+#foreach($line in $stringTool.splitOnNewlines(${parameter.documentation}))
+ * ${line}
+#end
*/
private ${parameter.type} ${parameter.name};
@@ -45,7 +49,10 @@
/**
* Getter for ${parameter.name} property.
*
- * @return ${parameter.documentation}
+ * @return
+#foreach($line in $stringTool.splitOnNewlines(${parameter.documentation}))
+ * ${line}
+#end
*/
public ${parameter.type} #if(${parameter.type} == 'boolean')is#{else}get#end${parameter.getterSetterSuffix}() {
return ${parameter.name};
@@ -55,7 +62,9 @@
* Setter for ${parameter.name} property.
*
* @param ${parameter.name}
- * ${parameter.documentation}
+#foreach($line in $stringTool.splitOnNewlines(${parameter.documentation}))
+ * ${line}
+#end
*/
public void set${parameter.getterSetterSuffix}(${parameter.type} ${parameter.name}) {
this.${parameter.name} = ${parameter.name};
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm Sat Feb 27 18:04:25 2010
@@ -25,7 +25,9 @@
version="2.1">
<description>
<![CDATA[
- ${suite.documentation}
+#foreach($line in $stringTool.splitOnNewlines(${suite.documentation}))
+ $line
+#end
]]>
</description>
<tlib-version>1.2</tlib-version>
@@ -35,7 +37,9 @@
<tag>
<description>
<![CDATA[
- ${clazz.documentation}
+#foreach($line in $stringTool.splitOnNewlines(${clazz.documentation}))
+ $line
+#end
]]>
</description>
<name>${clazz.tagName}</name>
@@ -45,7 +49,9 @@
<attribute>
<description>
<![CDATA[
- ${parameter.documentation}
+#foreach($line in $stringTool.splitOnNewlines(${parameter.documentation}))
+ $line
+#end
]]>
</description>
<name>${parameter.name}</name>
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TLDGeneratorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TLDGeneratorTest.java?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TLDGeneratorTest.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TLDGeneratorTest.java Sat Feb 27 18:04:25 2010
@@ -101,6 +101,8 @@
assertTrue(effectiveFile.exists());
InputStream effective = new FileInputStream(effectiveFile);
assertTrue(IOUtils.contentEquals(effective, expected));
+ effective.close();
+ expected.close();
FileUtils.deleteDirectory(file);
}
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TagClassGeneratorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TagClassGeneratorTest.java?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TagClassGeneratorTest.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/java/org/apache/tiles/autotag/jsp/TagClassGeneratorTest.java Sat Feb 27 18:04:25 2010
@@ -79,6 +79,8 @@
assertTrue(effectiveFile.exists());
InputStream effective = new FileInputStream(effectiveFile);
assertTrue(IOUtils.contentEquals(effective, expected));
+ effective.close();
+ expected.close();
suite.addTemplateClass(clazz);
params = new ArrayList<TemplateParameter>();
@@ -109,6 +111,8 @@
assertTrue(effectiveFile.exists());
effective = new FileInputStream(effectiveFile);
assertTrue(IOUtils.contentEquals(effective, expected));
+ effective.close();
+ expected.close();
FileUtils.deleteDirectory(file);
}
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java Sat Feb 27 18:04:25 2010
@@ -33,7 +33,8 @@
/**
* Getter for one property.
*
- * @return Parameter one.
+ * @return
+ * Parameter one.
*/
public java.lang.Double getOne() {
return one;
@@ -52,7 +53,8 @@
/**
* Getter for two property.
*
- * @return Parameter two.
+ * @return
+ * Parameter two.
*/
public float getTwo() {
return two;
@@ -71,7 +73,8 @@
/**
* Getter for three property.
*
- * @return Parameter three.
+ * @return
+ * Parameter three.
*/
public java.util.Date getThree() {
return three;
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java?rev=917001&r1=917000&r2=917001&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java Sat Feb 27 18:04:25 2010
@@ -33,7 +33,8 @@
/**
* Getter for one property.
*
- * @return Parameter one.
+ * @return
+ * Parameter one.
*/
public java.lang.String getOne() {
return one;
@@ -52,7 +53,8 @@
/**
* Getter for two property.
*
- * @return Parameter two.
+ * @return
+ * Parameter two.
*/
public int getTwo() {
return two;
@@ -71,7 +73,8 @@
/**
* Getter for three property.
*
- * @return Parameter three.
+ * @return
+ * Parameter three.
*/
public boolean isThree() {
return three;