Author: apetrelli
Date: Sun Mar 7 14:47:38 2010
New Revision: 920005
URL: http://svn.apache.org/viewvc?rev=920005&view=rev
Log:
TILESSB-25
Created Mojo for JSP support.
TILESSB-21
TILESSB-22
TILESSB-24
Improved code to work.
TILES-500
Added support for "flush" attribute.
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java
(with props)
Modified:
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/pom.xml
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/GenerateJspMojo.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/core/QDoxTemplateSuiteFactory.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/BasicTemplateGenerator.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/TemplateGenerator.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/model/TemplateParameter.java
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/BasicTemplateGeneratorTest.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
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld
Modified: tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/pom.xml?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/pom.xml Sun Mar 7
14:47:38 2010
@@ -44,5 +44,10 @@
<artifactId>tiles-autotag-jsp</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.2.1</version>
+ </dependency>
</dependencies>
</project>
Modified:
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojo.java
Sun Mar 7 14:47:38 2010
@@ -24,11 +24,12 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
import org.apache.tiles.autotag.core.QDoxTemplateSuiteFactory;
import org.apache.tiles.autotag.model.TemplateSuite;
-import org.apache.tiles.autotag.model.TemplateSuiteFactory;
import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner;
import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
@@ -47,7 +48,7 @@
/**
* Location of the file.
*
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter
expression="${project.build.directory}/autotag-template-suite"
* @required
*/
private File outputDirectory;
@@ -85,6 +86,13 @@
*/
private Set<String> excludes;
+ /**
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
@SuppressWarnings("unchecked")
public void execute() throws MojoExecutionException {
try {
@@ -103,6 +111,9 @@
Writer writer = new FileWriter(outputFile);
xstream.toXML(suite, writer);
writer.close();
+ Resource resource = new Resource();
+ resource.setDirectory(outputDirectory.getAbsolutePath());
+ project.addResource(resource);
} catch (InclusionScanException e) {
throw new MojoExecutionException("error", e);
} catch (IOException e) {
Modified:
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/GenerateJspMojo.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/GenerateJspMojo.java?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/GenerateJspMojo.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/maven-autotag-plugin/src/main/java/org/apache/tiles/autotag/plugin/GenerateJspMojo.java
Sun Mar 7 14:47:38 2010
@@ -25,8 +25,10 @@
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
import org.apache.tiles.autotag.generate.BasicTemplateGenerator;
import org.apache.tiles.autotag.jsp.TLDGenerator;
import org.apache.tiles.autotag.jsp.TagClassGenerator;
@@ -49,10 +51,18 @@
/**
* Location of the file.
*
- * @parameter expression="${project.build.directory}/autotag-jsp"
+ * @parameter expression="${project.build.directory}/autotag-jsp-classes"
* @required
*/
- private File outputDirectory;
+ private File classesOutputDirectory;
+
+ /**
+ * Location of the file.
+ *
+ * @parameter expression="${project.build.directory}/autotag-jsp-resources"
+ * @required
+ */
+ private File resourcesOutputDirectory;
/**
* Name of the package.
@@ -77,6 +87,13 @@
*/
private List<String> classpathElements;
+ /**
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
public void execute() throws MojoExecutionException {
try {
InputStream stream = findTemplateSuiteDescriptor();
@@ -84,8 +101,8 @@
TemplateSuite suite = (TemplateSuite) xstream.fromXML(stream);
stream.close();
BasicTemplateGenerator generator = new BasicTemplateGenerator();
- generator.addTemplateSuiteGenerator(new TLDGenerator());
- generator.addTemplateClassGenerator(new TagClassGenerator());
+ generator.addTemplateSuiteGenerator(resourcesOutputDirectory, new
TLDGenerator());
+ generator.addTemplateClassGenerator(classesOutputDirectory, new
TagClassGenerator());
suite.getCustomVariables().put("taglibURI", taglibURI);
Properties props = new Properties();
@@ -94,7 +111,12 @@
propsStream.close();
Velocity.init(props);
- generator.generate(outputDirectory, packageName, suite);
+ generator.generate(packageName, suite);
+
+ Resource resource = new Resource();
+ resource.setDirectory(resourcesOutputDirectory.getAbsolutePath());
+ project.addResource(resource);
+
project.addCompileSourceRoot(classesOutputDirectory.getAbsolutePath());
} catch (IOException e) {
throw new MojoExecutionException("error", e);
} catch (RuntimeException e) {
Added:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java?rev=920005&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java
(added)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java
Sun Mar 7 14:47:38 2010
@@ -0,0 +1,17 @@
+package org.apache.tiles.autotag.core.runtime.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+...@retention(RetentionPolicy.SOURCE)
+...@target(ElementType.PARAMETER)
+public @interface Parameter {
+
+ static final String SAME_NAME = "USE THE SAME NAME";
+
+ String name() default SAME_NAME;
+
+ boolean required() default false;
+}
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core-runtime/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/core/QDoxTemplateSuiteFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/core/QDoxTemplateSuiteFactory.java?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/core/QDoxTemplateSuiteFactory.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/core/QDoxTemplateSuiteFactory.java
Sun Mar 7 14:47:38 2010
@@ -7,6 +7,7 @@
import java.util.List;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.core.runtime.annotation.Parameter;
import org.apache.tiles.autotag.model.TemplateClass;
import org.apache.tiles.autotag.model.TemplateMethod;
import org.apache.tiles.autotag.model.TemplateParameter;
@@ -15,6 +16,7 @@
import org.apache.tiles.request.Request;
import com.thoughtworks.qdox.JavaDocBuilder;
+import com.thoughtworks.qdox.model.Annotation;
import com.thoughtworks.qdox.model.DocletTag;
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaMethod;
@@ -106,9 +108,25 @@
private TemplateMethod createMethod(JavaMethod method) {
List<TemplateParameter> params = new ArrayList<TemplateParameter>();
for (JavaParameter parameter : method.getParameters()) {
+ String exportedName = parameter.getName();
+ boolean required = false;
+ Annotation[] annotations = parameter.getAnnotations();
+ if (annotations != null && annotations.length > 0) {
+ boolean found = false;
+ for (int i = 0; i < annotations.length && !found; i++) {
+ if
(Parameter.class.getName().equals(annotations[i].getType().getFullyQualifiedName()))
{
+ found = true;
+ String candidateName = (String)
annotations[i].getNamedParameter("name");
+ if (candidateName != null && candidateName.length() >
2) {
+ exportedName = candidateName.substring(1,
candidateName.length() - 1);
+ }
+ required =
"true".equals(annotations[i].getNamedParameter("required"));
+ }
+ }
+ }
TemplateParameter templateParameter = new TemplateParameter(
- parameter.getName(), parameter.getType()
- .getFullyQualifiedName(), false);
+ parameter.getName(), exportedName, parameter.getType()
+ .getFullyQualifiedName(), required);
params.add(templateParameter);
}
TemplateMethod templateMethod = new TemplateMethod(method.getName(),
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/BasicTemplateGenerator.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/BasicTemplateGenerator.java?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/BasicTemplateGenerator.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/BasicTemplateGenerator.java
Sun Mar 7 14:47:38 2010
@@ -9,32 +9,75 @@
public class BasicTemplateGenerator implements TemplateGenerator {
- private List<TemplateSuiteGenerator> templateSuiteGenerators;
+ private List<TSGeneratorDirectoryPair> templateSuiteGenerators;
- private List<TemplateClassGenerator> templateClassGenerators;
+ private List<TCGeneratorDirectoryPair> templateClassGenerators;
public BasicTemplateGenerator() {
- templateClassGenerators = new ArrayList<TemplateClassGenerator>();
- templateSuiteGenerators = new ArrayList<TemplateSuiteGenerator>();
+ templateClassGenerators = new ArrayList<TCGeneratorDirectoryPair>();
+ templateSuiteGenerators = new ArrayList<TSGeneratorDirectoryPair>();
}
@Override
- public void generate(File directory, String packageName, TemplateSuite
suite) {
- for (TemplateSuiteGenerator generator: templateSuiteGenerators) {
- generator.generate(directory, packageName, suite);
+ public void generate(String packageName, TemplateSuite suite) {
+ for (TSGeneratorDirectoryPair pair: templateSuiteGenerators) {
+ pair.getGenerator().generate(pair.getDirectory(), packageName,
suite);
}
for (TemplateClass templateClass: suite.getTemplateClasses()) {
- for (TemplateClassGenerator generator: templateClassGenerators) {
- generator.generate(directory, packageName, suite,
templateClass);
+ for (TCGeneratorDirectoryPair pair: templateClassGenerators) {
+ pair.getGenerator().generate(pair.getDirectory(), packageName,
+ suite, templateClass);
}
}
}
- public void addTemplateSuiteGenerator(TemplateSuiteGenerator generator) {
- templateSuiteGenerators.add(generator);
+ public void addTemplateSuiteGenerator(File outputDirectory,
+ TemplateSuiteGenerator generator) {
+ templateSuiteGenerators.add(new TSGeneratorDirectoryPair(
+ outputDirectory, generator));
}
- public void addTemplateClassGenerator(TemplateClassGenerator generator) {
- templateClassGenerators.add(generator);
+ public void addTemplateClassGenerator(File outputDirectory,
TemplateClassGenerator generator) {
+ templateClassGenerators.add(new
TCGeneratorDirectoryPair(outputDirectory, generator));
+ }
+
+ private static class TSGeneratorDirectoryPair {
+ private File directory;
+
+ private TemplateSuiteGenerator generator;
+
+ public TSGeneratorDirectoryPair(File directory,
+ TemplateSuiteGenerator generator) {
+ this.directory = directory;
+ this.generator = generator;
+ }
+
+ public File getDirectory() {
+ return directory;
+ }
+
+ public TemplateSuiteGenerator getGenerator() {
+ return generator;
+ }
+ }
+
+ private static class TCGeneratorDirectoryPair {
+ private File directory;
+
+ private TemplateClassGenerator generator;
+
+ public TCGeneratorDirectoryPair(File directory,
+ TemplateClassGenerator generator) {
+ this.directory = directory;
+ this.generator = generator;
+ }
+
+ public File getDirectory() {
+ return directory;
+ }
+
+ public TemplateClassGenerator getGenerator() {
+ return generator;
+ }
}
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/TemplateGenerator.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/TemplateGenerator.java?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/TemplateGenerator.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/generate/TemplateGenerator.java
Sun Mar 7 14:47:38 2010
@@ -1,10 +1,9 @@
package org.apache.tiles.autotag.generate;
-import java.io.File;
import org.apache.tiles.autotag.model.TemplateSuite;
public interface TemplateGenerator {
- void generate(File directory, String packageName, TemplateSuite suite);
+ void generate(String packageName, TemplateSuite suite);
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/model/TemplateParameter.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/model/TemplateParameter.java?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/model/TemplateParameter.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/main/java/org/apache/tiles/autotag/model/TemplateParameter.java
Sun Mar 7 14:47:38 2010
@@ -7,14 +7,17 @@
private String name;
+ private String exportedName;
+
private String documentation;
private String type;
private boolean required;
- public TemplateParameter(String name, String type, boolean required) {
+ public TemplateParameter(String name, String exportedName, String type,
boolean required) {
this.name = name;
+ this.exportedName = exportedName;
this.type = type;
this.required = required;
}
@@ -31,6 +34,10 @@
return name;
}
+ public String getExportedName() {
+ return exportedName;
+ }
+
public String getType() {
return type;
}
@@ -48,14 +55,14 @@
}
public String getGetterSetterSuffix() {
- return name.substring(0, 1).toUpperCase() + name.substring(1);
+ return exportedName.substring(0, 1).toUpperCase() +
exportedName.substring(1);
}
@Override
public String toString() {
- return "TemplateParameter\n[documentation="
- + documentation + ",\nname=" + name + ", required=" + required
- + ", type=" + type + "]";
+ return "TemplateParameter\n[documentation=" + documentation
+ + ",\nname=" + name + ",\nexportedName=" + exportedName
+ + ", required=" + required + ", type=" + type + "]";
}
}
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/BasicTemplateGeneratorTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/BasicTemplateGeneratorTest.java?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/BasicTemplateGeneratorTest.java
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-core/src/test/java/org/apache/tiles/autotag/generate/BasicTemplateGeneratorTest.java
Sun Mar 7 14:47:38 2010
@@ -23,7 +23,7 @@
public class BasicTemplateGeneratorTest {
/**
- * Test method for {...@link
org.apache.tiles.autotag.generate.BasicTemplateGenerator#generate(java.io.File,
java.lang.String, org.apache.tiles.autotag.model.TemplateSuite)}.
+ * Test method for {...@link
org.apache.tiles.autotag.generate.BasicTemplateGenerator#generate(java.lang.String,
org.apache.tiles.autotag.model.TemplateSuite)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -44,9 +44,9 @@
templateClassGenerator.generate(file, "my.package", suite,
templateClass);
replay(generator, suite, templateClass, templateSuiteGenerator,
templateClassGenerator);
- generator.addTemplateSuiteGenerator(templateSuiteGenerator);
- generator.addTemplateClassGenerator(templateClassGenerator);
- generator.generate(file, "my.package", suite);
+ generator.addTemplateSuiteGenerator(file, templateSuiteGenerator);
+ generator.addTemplateClassGenerator(file, templateClassGenerator);
+ generator.generate("my.package", suite);
verify(generator, suite, templateClass, templateSuiteGenerator,
templateClassGenerator);
}
}
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=920005&r1=920004&r2=920005&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
Sun Mar 7 14:47:38 2010
@@ -21,7 +21,10 @@
*#
import java.io.IOException;
+#if(${clazz.hasBody()})
import org.apache.tiles.autotag.core.runtime.ModelBody;
+#end
+import org.apache.tiles.jsp.taglib.Body#if(!${clazz.hasBody()})less#{end}Tag;
import org.apache.tiles.request.Request;
/**
@@ -47,7 +50,7 @@
#end
#foreach($parameter in ${clazz.parameters})
/**
- * Getter for ${parameter.name} property.
+ * Getter for ${parameter.exportedName} property.
*
* @return
#foreach($line in $stringTool.splitOnNewlines(${parameter.documentation}))
@@ -59,7 +62,7 @@
}
/**
- * Setter for ${parameter.name} property.
+ * Setter for ${parameter.exportedName} property.
*
* @param ${parameter.name}
#foreach($line in $stringTool.splitOnNewlines(${parameter.documentation}))
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=920005&r1=920004&r2=920005&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
Sun Mar 7 14:47:38 2010
@@ -43,7 +43,7 @@
]]>
</description>
<name>${clazz.tagName}</name>
- <tag-class>${packageName}.${clazz.tagClassPrefix}</tag-class>
+ <tag-class>${packageName}.${clazz.tagClassPrefix}Tag</tag-class>
<body-content>#if(${clazz.hasBody()})scriptless#{else}empty#end</body-content>
#foreach($parameter in ${clazz.parameters})
<attribute>
@@ -54,7 +54,7 @@
#end
]]>
</description>
- <name>${parameter.name}</name>
+ <name>${parameter.exportedName}</name>
<required>${parameter.required}</required>
<rtexprvalue>true</rtexprvalue>
<type>${parameter.type}</type>
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=920005&r1=920004&r2=920005&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
Sun Mar 7 14:47:38 2010
@@ -45,19 +45,19 @@
suite.getCustomVariables().put("taglibURI",
"http://www.initrode.net/tags/test";);
List<TemplateParameter> params = new ArrayList<TemplateParameter>();
- TemplateParameter param = new TemplateParameter("one",
"java.lang.String", true);
+ TemplateParameter param = new TemplateParameter("one", "one",
"java.lang.String", true);
param.setDocumentation("Parameter one.");
params.add(param);
- param = new TemplateParameter("two", "int", false);
+ param = new TemplateParameter("two", "two", "int", false);
param.setDocumentation("Parameter two.");
params.add(param);
- param = new TemplateParameter("three", "long", false);
+ param = new TemplateParameter("three", "three", "long", false);
param.setDocumentation("Parameter three.");
params.add(param);
- param = new TemplateParameter("request", Request.class.getName(),
false);
+ param = new TemplateParameter("request", "request",
Request.class.getName(), false);
param.setDocumentation("The request.");
params.add(param);
- param = new TemplateParameter("modelBody", ModelBody.class.getName(),
false);
+ param = new TemplateParameter("modelBody", "modelBody",
ModelBody.class.getName(), false);
param.setDocumentation("The body.");
params.add(param);
TemplateMethod executeMethod = new TemplateMethod("execute", params);
@@ -68,16 +68,16 @@
suite.addTemplateClass(clazz);
params = new ArrayList<TemplateParameter>();
- param = new TemplateParameter("one", "java.lang.Double", true);
+ param = new TemplateParameter("one", "one", "java.lang.Double", true);
param.setDocumentation("Parameter one.");
params.add(param);
- param = new TemplateParameter("two", "float", false);
+ param = new TemplateParameter("two", "two", "float", false);
param.setDocumentation("Parameter two.");
params.add(param);
- param = new TemplateParameter("three", "java.util.Date", false);
+ param = new TemplateParameter("three", "three", "java.util.Date",
false);
param.setDocumentation("Parameter three.");
params.add(param);
- param = new TemplateParameter("request", Request.class.getName(),
false);
+ param = new TemplateParameter("request", "request",
Request.class.getName(), false);
param.setDocumentation("The request.");
params.add(param);
executeMethod = new TemplateMethod("execute", params);
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=920005&r1=920004&r2=920005&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
Sun Mar 7 14:47:38 2010
@@ -45,19 +45,19 @@
suite.getCustomVariables().put("taglibURI",
"http://www.initrode.net/tags/test";);
List<TemplateParameter> params = new ArrayList<TemplateParameter>();
- TemplateParameter param = new TemplateParameter("one",
"java.lang.String", true);
+ TemplateParameter param = new TemplateParameter("one", "one",
"java.lang.String", true);
param.setDocumentation("Parameter one.");
params.add(param);
- param = new TemplateParameter("two", "int", false);
+ param = new TemplateParameter("two", "two", "int", false);
param.setDocumentation("Parameter two.");
params.add(param);
- param = new TemplateParameter("three", "boolean", false);
+ param = new TemplateParameter("three", "three", "boolean", false);
param.setDocumentation("Parameter three.");
params.add(param);
- param = new TemplateParameter("request", Request.class.getName(),
false);
+ param = new TemplateParameter("request", "request",
Request.class.getName(), false);
param.setDocumentation("The request.");
params.add(param);
- param = new TemplateParameter("modelBody", ModelBody.class.getName(),
false);
+ param = new TemplateParameter("modelBody", "modelBody",
ModelBody.class.getName(), false);
param.setDocumentation("The body.");
params.add(param);
TemplateMethod executeMethod = new TemplateMethod("execute", params);
@@ -84,16 +84,16 @@
suite.addTemplateClass(clazz);
params = new ArrayList<TemplateParameter>();
- param = new TemplateParameter("one", "java.lang.Double", true);
+ param = new TemplateParameter("one", "one", "java.lang.Double", true);
param.setDocumentation("Parameter one.");
params.add(param);
- param = new TemplateParameter("two", "float", false);
+ param = new TemplateParameter("two", "two", "float", false);
param.setDocumentation("Parameter two.");
params.add(param);
- param = new TemplateParameter("three", "java.util.Date", false);
+ param = new TemplateParameter("three", "three", "java.util.Date",
false);
param.setDocumentation("Parameter three.");
params.add(param);
- param = new TemplateParameter("request", Request.class.getName(),
false);
+ param = new TemplateParameter("request", "request",
Request.class.getName(), false);
param.setDocumentation("The request.");
params.add(param);
executeMethod = new TemplateMethod("execute", params);
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=920005&r1=920004&r2=920005&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
Sun Mar 7 14:47:38 2010
@@ -2,7 +2,7 @@
import java.io.IOException;
-import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.jsp.taglib.BodylessTag;
import org.apache.tiles.request.Request;
/**
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=920005&r1=920004&r2=920005&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
Sun Mar 7 14:47:38 2010
@@ -3,6 +3,7 @@
import java.io.IOException;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.jsp.taglib.BodyTag;
import org.apache.tiles.request.Request;
/**
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld?rev=920005&r1=920004&r2=920005&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld
(original)
+++
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-jsp/src/test/resources/tldtest-jsp.tld
Sun Mar 7 14:47:38 2010
@@ -19,7 +19,7 @@
]]>
</description>
<name>doStuff</name>
- <tag-class>org.apache.tiles.autotag.jsp.test.DoStuff</tag-class>
+ <tag-class>org.apache.tiles.autotag.jsp.test.DoStuffTag</tag-class>
<body-content>scriptless</body-content>
<attribute>
<description>
@@ -62,7 +62,7 @@
]]>
</description>
<name>doStuffNoBody</name>
- <tag-class>org.apache.tiles.autotag.jsp.test.DoStuffNoBody</tag-class>
+ <tag-class>org.apache.tiles.autotag.jsp.test.DoStuffNoBodyTag</tag-class>
<body-content>empty</body-content>
<attribute>
<description>
