You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/11/12 23:23:28 UTC
svn commit: r594319 [2/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/org...
Modified: tapestry/tapestry5/trunk/tapestry-annotations/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/.classpath?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/.classpath Mon Nov 12 14:22:31 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="bin" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-annotations/.project
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/.project?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/.project Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
<projectDescription>
- <name>tapestry-annotations</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-annotations</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-annotations/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/pom.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/pom.xml Mon Nov 12 14:22:31 2007
@@ -1,46 +1,47 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-annotations</artifactId>
- <packaging>jar</packaging>
- <!-- This should change to tapestry-project -->
- <parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-project</artifactId>
- <version>5.0.7-SNAPSHOT</version>
- </parent>
- <name>Tapestry Annotations</name>
- <description>
- Annotations used with Tapestry applications.
- </description>
- <inceptionYear>2007</inceptionYear>
+ <artifactId>tapestry-annotations</artifactId>
+ <packaging>jar</packaging>
+ <!-- This should change to tapestry-project -->
+ <parent>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-project</artifactId>
+ <version>5.0.7-SNAPSHOT</version>
+ </parent>
+ <name>Tapestry Annotations</name>
+ <description>
+ Annotations used with Tapestry applications.
+ </description>
+ <inceptionYear>2007</inceptionYear>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>summary</report>
- <report>dependencies</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>summary</report>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/NonVisual.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/NonVisual.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/NonVisual.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/NonVisual.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,10 @@
package org.apache.tapestry.beaneditor;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderAfter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderAfter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderAfter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderAfter.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,10 @@
package org.apache.tapestry.beaneditor;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
@@ -28,8 +27,7 @@
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface OrderAfter
-{
+public @interface OrderAfter {
/**
* The name of the other property. This property will be ordered before the other property.
*/
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderBefore.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderBefore.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderBefore.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/OrderBefore.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,10 @@
package org.apache.tapestry.beaneditor;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
@@ -28,8 +27,7 @@
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface OrderBefore
-{
+public @interface OrderBefore {
/**
* The name of the other property. This property will be ordered before the other property.
*/
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/RelativePosition.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/RelativePosition.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/RelativePosition.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/RelativePosition.java Mon Nov 12 14:22:31 2007
@@ -17,11 +17,14 @@
/**
* Controls the position of newly added {@link PropertyModel}s inside a {@link BeanModel}.
*/
-public enum RelativePosition
-{
- /** The new {@link PropertyModel} goes before the existing model. */
+public enum RelativePosition {
+ /**
+ * The new {@link PropertyModel} goes before the existing model.
+ */
BEFORE,
- /** The new {@link PropertyModel} goes after the existing model. */
+ /**
+ * The new {@link PropertyModel} goes after the existing model.
+ */
AFTER
}
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/Validate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/Validate.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/Validate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/Validate.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,10 @@
package org.apache.tapestry.beaneditor;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
/**
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/site/site.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-annotations/src/site/site.xml Mon Nov 12 14:22:31 2007
@@ -16,28 +16,28 @@
-->
<project name="Tapestry Annotations">
- <bannerLeft>
- <name>Tapestry 5</name>
- <href>http://tapestry.apache.org/tapestry5/</href>
- <src>images/tapestry_banner.gif</src>
- </bannerLeft>
- <bannerRight>
- <name>Apache</name>
- <href>http://www.apache.org</href>
- <src>images/asf_logo_wide.gif</src>
- </bannerRight>
- <skin>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>maven-skin</artifactId>
- <version>1.1</version>
- </skin>
+ <bannerLeft>
+ <name>Tapestry 5</name>
+ <href>http://tapestry.apache.org/tapestry5/</href>
+ <src>images/tapestry_banner.gif</src>
+ </bannerLeft>
+ <bannerRight>
+ <name>Apache</name>
+ <href>http://www.apache.org</href>
+ <src>images/asf_logo_wide.gif</src>
+ </bannerRight>
+ <skin>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.1</version>
+ </skin>
- <publishDate format="dd MMM yyyy" />
+ <publishDate format="dd MMM yyyy"/>
- <body>
+ <body>
- <menu ref="reports" />
+ <menu ref="reports"/>
- </body>
+ </body>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-component-report/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/.classpath?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/.classpath Mon Nov 12 14:22:31 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="bin" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-component-report/.project
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/.project?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/.project Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
<projectDescription>
- <name>tapestry-component-report</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-component-report</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-component-report/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/pom.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/pom.xml Mon Nov 12 14:22:31 2007
@@ -1,155 +1,156 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-component-report</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Tapestry Component Parameters Report</name>
- <description>
- Generates component parameter documentation for Tapestry components,
- mixins (and base classes)
- </description>
- <parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-project</artifactId>
- <version>5.0.7-SNAPSHOT</version>
- </parent>
-
- <inceptionYear>2007</inceptionYear>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
-
- <!-- Copied from the maven javadoc plugin, for what's its worth. -->
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.2</version>
- <exclusions>
- <!-- Using org.codehaus.plexus:plexus-utils instead of
- -->
- <exclusion>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.2</version>
- <exclusions>
- <!-- Using org.codehaus.plexus:plexus-utils instead of
- -->
- <exclusion>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-descriptor</artifactId>
- <version>2.0</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- <version>1.0-alpha-8</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-ioc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>summary</report>
- <report>dependencies</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <!-- Temporary: until we figure out what needs org.apache.maven.plugins:maven-plugins:pom:2-SNAPSHOT -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </pluginRepository>
- </pluginRepositories>
+ <artifactId>tapestry-component-report</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>Tapestry Component Parameters Report</name>
+ <description>
+ Generates component parameter documentation for Tapestry components,
+ mixins (and base classes)
+ </description>
+ <parent>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-project</artifactId>
+ <version>5.0.7-SNAPSHOT</version>
+ </parent>
+
+ <inceptionYear>2007</inceptionYear>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+
+ <!-- Copied from the maven javadoc plugin, for what's its worth. -->
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.2</version>
+ <exclusions>
+ <!-- Using org.codehaus.plexus:plexus-utils instead of
+ -->
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.2</version>
+ <exclusions>
+ <!-- Using org.codehaus.plexus:plexus-utils instead of
+ -->
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-descriptor</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>1.0-alpha-8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-ioc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>summary</report>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>default-tools.jar</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <!-- Temporary: until we figure out what needs org.apache.maven.plugins:maven-plugins:pom:2-SNAPSHOT -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </pluginRepository>
+ </pluginRepositories>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java Mon Nov 12 14:22:31 2007
@@ -14,28 +14,18 @@
package org.apache.tapestry.mojo;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
import nu.xom.Builder;
import nu.xom.Document;
import nu.xom.Element;
import nu.xom.Elements;
-
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
@@ -45,10 +35,14 @@
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.DefaultConsumer;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
/**
* The component report generates documentation about components and parameters within the current
* project.
- *
+ *
* @goal component-report
* @requiresDependencyResolution compile
* @execute phase="generate-sources"
@@ -57,7 +51,7 @@
{
/**
* Identifies the application root package.
- *
+ *
* @parameter
* @required
*/
@@ -65,7 +59,7 @@
/**
* The Maven Project Object
- *
+ *
* @parameter expression="${project}"
* @required
* @readonly
@@ -74,14 +68,14 @@
/**
* Generates the site report
- *
+ *
* @component
*/
private SiteRenderer siteRenderer;
/**
* Location of the generated site.
- *
+ *
* @parameter default-value="${project.reporting.outputDirectory}"
* @required
*/
@@ -89,7 +83,7 @@
/**
* Working directory for temporary files.
- *
+ *
* @parameter default-value="target"
* @required
*/
@@ -99,7 +93,7 @@
* Relative path from the generated report to the API documentation (Javadoc). Defaults to
* "apidocs" but will often be changed to "../apidocs" when documentation is created at the
* project level.
- *
+ *
* @parameter default-value="apidocs"
* @required
*/
@@ -178,14 +172,16 @@
}
- /** Convert to lower case, remove all period characters. */
+ /**
+ * Convert to lower case, remove all period characters.
+ */
private String fixup(String input)
{
return input.toLowerCase().replaceAll("\\.", "");
}
private void writeClassDescription(Map<String, ClassDescription> descriptions, Sink sink,
- String className)
+ String className)
{
ClassDescription cd = descriptions.get(className);
@@ -315,7 +311,7 @@
}
private final static String[] PARAMETER_HEADERS =
- { "Name", "Type", "Flags", "Default", "Default Prefix", "Description" };
+ {"Name", "Type", "Flags", "Default", "Default Prefix", "Description"};
private Map<String, ClassDescription> runJavadoc() throws MavenReportException
{
@@ -330,23 +326,23 @@
catch (IOException ex)
{
throw new MavenReportException("Unable to locate javadoc command: " + ex.getMessage(),
- ex);
+ ex);
}
String parametersPath = workDirectory + File.separator + "component-parameters.xml";
String[] arguments =
- { "-private", "-o", parametersPath,
+ {"-private", "-o", parametersPath,
- "-subpackages", rootPackage,
+ "-subpackages", rootPackage,
- "-doclet", ParametersDoclet.class.getName(),
+ "-doclet", ParametersDoclet.class.getName(),
- "-docletpath", docletPath(),
+ "-docletpath", docletPath(),
- "-sourcepath", sourcePath(),
+ "-sourcepath", sourcePath(),
- "-classpath", classPath() };
+ "-classpath", classPath()};
command.addArguments(arguments);
@@ -365,7 +361,7 @@
/**
* Needed to help locate this plugin's local JAR file for the -doclet argument.
- *
+ *
* @parameter default-value="${localRepository}"
* @read-only
*/
@@ -373,7 +369,7 @@
/**
* Needed to help locate this plugin's local JAR file for the -doclet argument.
- *
+ *
* @parameter default-value="${plugin.groupId}"
* @read-only
*/
@@ -381,7 +377,7 @@
/**
* Needed to help locate this plugin's local JAR file for the -doclet argument.
- *
+ *
* @parameter default-value="${plugin.artifactId}"
* @read-only
*/
@@ -389,7 +385,7 @@
/**
* Needed to help locate this plugin's local JAR file for the -doclet argument.
- *
+ *
* @parameter default-value="${plugin.version}"
* @read-only
*/
@@ -463,7 +459,7 @@
catch (CommandLineException ex)
{
throw new MavenReportException("Unable to execute javadoc command: " + ex.getMessage(),
- ex);
+ ex);
}
// ----------------------------------------------------------------------
@@ -504,7 +500,7 @@
return new File(SystemUtils.getJavaHome() + File.separator + "bin", executableName);
return new File(SystemUtils.getJavaHome() + File.separator + ".." + File.separator + "bin",
- executableName);
+ executableName);
}
private String toArgumentPath(List<String> paths)
@@ -590,7 +586,7 @@
String description = node.getValue();
ParameterDescription pd = new ParameterDescription(name, type, defaultValue,
- defaultPrefix, required, cache, description);
+ defaultPrefix, required, cache, description);
cd.getParameters().put(name, pd);
}
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java Mon Nov 12 14:22:31 2007
@@ -31,7 +31,7 @@
private final String _description;
public ParameterDescription(String name, String type, String defaultValue,
- String defaultPrefix, boolean required, boolean cache, String description)
+ String defaultPrefix, boolean required, boolean cache, String description)
{
_name = name;
_type = type;
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,9 @@
package org.apache.tapestry.mojo;
+import com.sun.javadoc.*;
+import com.sun.javadoc.AnnotationDesc.ElementValuePair;
+
import java.io.File;
import java.io.PrintWriter;
import java.util.HashMap;
@@ -22,27 +25,14 @@
import java.util.Set;
import java.util.regex.Pattern;
-import com.sun.javadoc.AnnotationDesc;
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.ConstructorDoc;
-import com.sun.javadoc.Doc;
-import com.sun.javadoc.DocErrorReporter;
-import com.sun.javadoc.Doclet;
-import com.sun.javadoc.FieldDoc;
-import com.sun.javadoc.LanguageVersion;
-import com.sun.javadoc.RootDoc;
-import com.sun.javadoc.SeeTag;
-import com.sun.javadoc.Tag;
-import com.sun.javadoc.AnnotationDesc.ElementValuePair;
-
/**
* Generates an XML file that identifies all the classes that contain parameters, and all the
* parameters within each component class. This XML is later converted into part of the Maven
* generated HTML site.
- * <p>
+ * <p/>
* To keep the -doclet parameter passed to javadoc simple, this class should not have any outside
* dependencies.
- * <p>
+ * <p/>
* Works in two passes: First we find any classes that have a field that has the parameter
* annotation. Second we locate any subclasses of the initial set of classes, regardless of whether
* they have a parameter or not.
@@ -266,7 +256,9 @@
}
}
- /** Yes we are interested in annotations, etc. */
+ /**
+ * Yes we are interested in annotations, etc.
+ */
public static LanguageVersion languageVersion()
{
return LanguageVersion.JAVA_1_5;
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/site/site.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/site/site.xml Mon Nov 12 14:22:31 2007
@@ -31,18 +31,17 @@
<artifactId>maven-skin</artifactId>
<version>1.1</version>
</skin>
-
- <publishDate format="dd MMM yyyy" />
-
+
+ <publishDate format="dd MMM yyyy"/>
+
<body>
-
-
+
<menu name="Tapestry Component Report">
<item name="Usage" href="index.html"/>
- </menu>
-
+ </menu>
+
<menu ref="reports"/>
-
+
</body>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-core/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/.classpath?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-core/.classpath Mon Nov 12 14:22:31 2007
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="bin" path="src/main/java"/>
- <classpathentry kind="src" output="bin-test" path="src/test/java"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="lib" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-core/.project
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/.project?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-core/.project Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
<projectDescription>
- <name>tapestry-core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-core/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/pom.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/pom.xml Mon Nov 12 14:22:31 2007
@@ -1,116 +1,117 @@
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-core</artifactId>
- <packaging>jar</packaging>
- <parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-project</artifactId>
- <version>5.0.7-SNAPSHOT</version>
- </parent>
- <name>Tapestry Core Library</name>
- <description>
- Central module for Tapestry, containing interfaces to the Java
- Servlet API and all core services and components.
- </description>
- <inceptionYear>2006</inceptionYear>
+ <artifactId>tapestry-core</artifactId>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-project</artifactId>
+ <version>5.0.7-SNAPSHOT</version>
+ </parent>
+ <name>Tapestry Core Library</name>
+ <description>
+ Central module for Tapestry, containing interfaces to the Java
+ Servlet API and all core services and components.
+ </description>
+ <inceptionYear>2006</inceptionYear>
- <dependencies>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-ioc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-annotations</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-test</artifactId>
- <!-- This would be test, but we provide a few base classes that depend on TestNG, which is provided by tapestry-test. -->
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- <!-- This gets the plugin to clean up the cobertura.ser file left
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-ioc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-annotations</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-test</artifactId>
+ <!-- This would be test, but we provide a few base classes that depend on TestNG, which is provided by tapestry-test. -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <!-- This gets the plugin to clean up the cobertura.ser file left
in the root directory. -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura-plugin-version}</version>
- <executions>
- <execution>
- <id>clean</id>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>summary</report>
- <report>dependencies</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>summary</report>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura-plugin-version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
- <plugin>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-component-report</artifactId>
- <version>${project.version}</version>
- <configuration>
- <rootPackage>org.apache.tapestry.corelib</rootPackage>
- <apidocs>../apidocs</apidocs>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <plugin>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-component-report</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <rootPackage>org.apache.tapestry.corelib</rootPackage>
+ <apidocs>../apidocs</apidocs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Asset.java Mon Nov 12 14:22:31 2007
@@ -20,7 +20,7 @@
* An Asset is any kind of resource that can be exposed to the client web browser. Although quite
* often an Asset is a resource in a web application's context folder, within Tapestry, Assets may
* also be resources on the classpath (i.e., packaged inside JARs).
- * <p>
+ * <p/>
* An Asset's toString() will return the URL for the resource (the same value as
* {@link #toClientURL()}).
*/
@@ -32,6 +32,8 @@
*/
String toClientURL();
- /** Returns the underlying Resource for the Asset. */
+ /**
+ * Returns the underlying Resource for the Asset.
+ */
Resource getResource();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Binding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Binding.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Binding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Binding.java Mon Nov 12 14:22:31 2007
@@ -22,7 +22,7 @@
* can represent any kind of value that can be obtained from the parent component, but is often a
* JavaBean property that can be read and updated. Different implementations of Binding as used to
* access different kinds of resources of the container.
- * <p>
+ * <p/>
* A binding ultimately must provide access to the underlying annotations. In most cases, there are
* no annotations, but bindings that ultimate invoke methods or read and update fields must provide
* access to those annotations.
@@ -40,7 +40,7 @@
* Updates the current value. Most types of bindings are read-only, and this method will throw a
* runtime exception. It is the caller's responsibility to ensure that the value passed in is of
* the appropriate type.
- *
+ *
* @param value
*/
void set(Object value);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ClientElement.java Mon Nov 12 14:22:31 2007
@@ -21,7 +21,7 @@
* (JavaScript) logic. For components, the client id will be null or innaccurate until after the
* component has rendered itself. Inside of any kind of loop, the clientId property is only accurate
* just after the component has rendered, and before it renders again.
- * <p>
+ * <p/>
* Some components must be configured to provide a client id. In many cases, the client id matches
* the component's {@link ComponentResourcesCommon#getId() component id}, typically passed through
* {@link PageRenderSupport#allocateClientId(String)} to ensure uniqueness.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentAction.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentAction.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentAction.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentAction.java Mon Nov 12 14:22:31 2007
@@ -1,35 +1,37 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry;
-import java.io.Serializable;
+import java.io.Serializable;
/**
* An action that is associated with a component. This is used in several areas of Tapestry and is
* primarily an attempt to externalize state for a component so that it can be recorded outside the
* object.
- * <p>
+ * <p/>
* ComponentActions should be immutable. They are often created during one request and associated
* with a particular component instance. They are then used in a later request (with an equivalent
* component instance).
- * <p>
+ * <p/>
* ComponentActions are serializable (they are often serialized into Base64 strings for storage on
* the client).
*/
public interface ComponentAction<T> extends Serializable
{
- /** Passed a component instance, the action should operate upon the instance. */
+ /**
+ * Passed a component instance, the action should operate upon the instance.
+ */
void execute(T component);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentEventHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentEventHandler.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentEventHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentEventHandler.java Mon Nov 12 14:22:31 2007
@@ -20,7 +20,7 @@
/**
* Handler for a {@link ComponentEvent}, notified when a non-null value is returned from some event
* handler method.
- * <p>
+ * <p/>
* TODO: Multiple handlers for different result types / strategy pattern?
*/
public interface ComponentEventHandler<T>
@@ -28,13 +28,10 @@
/**
* Invoked to handle a non-null event handler method result. The handler should determine
* whether the value is acceptible, and throw an exception if not.
- *
- * @param result
- * the result value provided by a method
- * @param component
- * the component from which the result was obtained
- * @param methodDescription
- * a string description of the class and method name (used when errors occur).
+ *
+ * @param result the result value provided by a method
+ * @param component the component from which the result was obtained
+ * @param methodDescription a string description of the class and method name (used when errors occur).
* @return true if the event is aborted, false if the event may continue
*/
boolean handleResult(T result, Component component, String methodDescription);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResources.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResources.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResources.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResources.java Mon Nov 12 14:22:31 2007
@@ -35,7 +35,9 @@
*/
Resource getBaseResource();
- /** Returns the component model object that defines the behavior of the component. */
+ /**
+ * Returns the component model object that defines the behavior of the component.
+ */
ComponentModel getComponentModel();
/**
@@ -71,28 +73,29 @@
/**
* Returns an embedded component, given the component's id.
- *
- * @param embeddedId
- * selects the embedded component (case is ignored)
- * @throws IllegalArgumentException
- * if this component does not contain a component with the given id
+ *
+ * @param embeddedId selects the embedded component (case is ignored)
+ * @throws IllegalArgumentException if this component does not contain a component with the given id
*/
Component getEmbeddedComponent(String embeddedId);
- /** Returns true if the named parameter is bound, false if not. */
+ /**
+ * Returns true if the named parameter is bound, false if not.
+ */
boolean isBound(String parameterName);
/**
* Indentifies all parameters that are not formal parameters and writes each as a
* attribute/value pair into the current element of the markup writer.
- *
- * @param writer
- * to which {@link MarkupWriter#attributes(Object[]) attributes} will be written
+ *
+ * @param writer to which {@link MarkupWriter#attributes(Object[]) attributes} will be written
*/
void renderInformalParameters(MarkupWriter writer);
- /** Returns the message catalog for this component. */
+ /**
+ * Returns the message catalog for this component.
+ */
Messages getMessages();
/**
@@ -101,28 +104,25 @@
* property, rather than the type of parameter (remember that type coercion automatically
* occurs, which can mask significant differences between the parameter type and the bound
* property type).
- *
- * @see Binding#getBindingType()
- * @param parameterName
- * used to select the parameter (case is ignored)
+ *
+ * @param parameterName used to select the parameter (case is ignored)
* @return the type of the bound parameter, or null if the parameter is not bound
+ * @see Binding#getBindingType()
*/
Class getBoundType(String parameterName);
/**
* Returns an annotation provider, used to obtain annotations related to the parameter.
- *
- * @param parameterName
- * used to select the parameter (case is ignored)
+ *
+ * @param parameterName used to select the parameter (case is ignored)
* @return the annotation provider, or null if the parameter is not bound
*/
AnnotationProvider getAnnotationProvider(String parameterName);
/**
* Used to access an informal parameter that's a Block.
- *
- * @param parameterName
- * the name of the informal parameter (case is ignored)
+ *
+ * @param parameterName the name of the informal parameter (case is ignored)
* @return the informal Block parameter, or null if not bound
*/
Block getBlockParameter(String parameterName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ComponentResourcesCommon.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry;
-import java.util.Locale;
-
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.internal.services.OnEventWorker;
import org.apache.tapestry.internal.structure.ComponentPageElement;
@@ -24,6 +22,8 @@
import org.apache.tapestry.services.ComponentSource;
import org.slf4j.Logger;
+import java.util.Locale;
+
/**
* Operations shared by the public {@link ComponentResources} interface and
* {@link ComponentPageElement} interface (on the internal side).
@@ -45,29 +45,23 @@
/**
* Creates a component action request link as a callback for this component.
- *
- * @param action
- * a name for the action associated with the link
- * @param forForm
- * if true, the link will be used as the action for an HTML form submission, which
- * may affect what information is encoded into the link
- * @param context
- * additional objects to be encoded into the path portion of the link; each is
- * converted to a string an URI encoded
+ *
+ * @param action a name for the action associated with the link
+ * @param forForm if true, the link will be used as the action for an HTML form submission, which
+ * may affect what information is encoded into the link
+ * @param context additional objects to be encoded into the path portion of the link; each is
+ * converted to a string an URI encoded
*/
Link createActionLink(String action, boolean forForm, Object... context);
/**
* Creates a render request link to a specific page.
- *
- * @param pageName
- * the logical name of the page to link to
- * @param override
- * if true, the context is used even if empty (normally, the target page is allowed
- * to passivate, providing a context, when the provided context is empty)
- * @param context
- * the activation context for the page. If omitted, the activation context is
- * obtained from the target paget
+ *
+ * @param pageName the logical name of the page to link to
+ * @param override if true, the context is used even if empty (normally, the target page is allowed
+ * to passivate, providing a context, when the provided context is empty)
+ * @param context the activation context for the page. If omitted, the activation context is
+ * obtained from the target paget
*/
Link createPageLink(String pageName, boolean override, Object... context);
@@ -75,9 +69,9 @@
* Returns a string consisting of the fully qualified class name of the containing page, and the
* {@link #getNestedId() nested id} of this component, separated by a colon. I.e.,
* "MyPage:foo.bar.baz". For a page, returns just the page's logical name.
- * <p>
+ * <p/>
* This value is often used to obtain an equivalent component instance in a later request.
- *
+ *
* @see ComponentSource
*/
@@ -88,19 +82,16 @@
* component, then its container, and so on. When a matching event handler method is located, it
* is invoked. If the method returns a value, the value is passed to the handler (if handler is
* null, then it is an error for a method to return a non-null vavlue).
- * <p>
+ * <p/>
* Resolution of event type to event handler methods is case insensitive.
- *
- * @param eventType
- * event type (as determined from the request, or otherwise by design)
- * @param context
- * the context (as extracted from the request, or provided by the triggering
- * component); these values may be provided to event handler methods via their
- * parameters (may be null)
- * @param handler
- * the handler to be informed of the result, or null if the event is a notification
- * that does not support return values from event handler methods (the value true is
- * allowed even if the handler is null).
+ *
+ * @param eventType event type (as determined from the request, or otherwise by design)
+ * @param context the context (as extracted from the request, or provided by the triggering
+ * component); these values may be provided to event handler methods via their
+ * parameters (may be null)
+ * @param handler the handler to be informed of the result, or null if the event is a notification
+ * that does not support return values from event handler methods (the value true is
+ * allowed even if the handler is null).
* @return true if any event handler was invoked (even if no event handler method returns a
* non-null value)
* @see OnEventWorker
@@ -117,39 +108,38 @@
/**
* Returns the log instance associated with the component (which is based on the component or
* mixin's class name).
- *
+ *
* @see ComponentModel#getLogger()
*/
Logger getLogger();
- /** Returns the locale for the page containing this component. */
+ /**
+ * Returns the locale for the page containing this component.
+ */
Locale getLocale();
/**
* Returns the name of element that represents the component in its template, or null if the
* element was a component type (in the Tapestry namespace).
- *
+ *
* @return the element name
*/
String getElementName();
/**
* Returns a block from the component's template, referenced by its id.
- *
- * @param blockId
- * the id of the block (case insensitive)
+ *
+ * @param blockId the id of the block (case insensitive)
* @return the identified Block
- * @throws BlockNotFoundException
- * if no block with the given id exists
+ * @throws BlockNotFoundException if no block with the given id exists
* @see #findBlock(String)
*/
Block getBlock(String blockId);
/**
* As with {@link #getBlock(String)}, but returns null if the block is not found.
- *
- * @param blockId
- * the id of the block (case insensitive)
+ *
+ * @param blockId the id of the block (case insensitive)
* @return the block, or null
*/
Block findBlock(String blockId);
@@ -157,7 +147,7 @@
/**
* Returns the <em>logical</em> name of the page containing this component. This is the short
* name (it often appears in URLs)
- *
+ *
* @return the logical name of the page which contains this component
*/
String getPageName();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Field.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Field.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Field.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Field.java Mon Nov 12 14:22:31 2007
@@ -29,7 +29,7 @@
* Returns a user presentable (localized) label for the field, which may be used inside
* <label> elements on the client, and inside client or server-side validation error
* messages.
- *
+ *
* @return the label
*/
String getLabel();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FieldValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FieldValidator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FieldValidator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FieldValidator.java Mon Nov 12 14:22:31 2007
@@ -16,7 +16,7 @@
/**
* Responsible for validation of a single field.
- *
+ *
* @param <T>
* @see Validator
*/
@@ -26,18 +26,16 @@
* Invoked after the client-submitted value has been {@link Translator translated} to check that
* the value conforms to expectations (often, in terms of minimum or maximum value). If and only
* if the value is approved by all Validators is the value applied by the field.
- *
- * @param value
- * the translated value supplied by the user
- * @throws ValidationException
- * if the value violates the constraint
+ *
+ * @param value the translated value supplied by the user
+ * @throws ValidationException if the value violates the constraint
*/
void validate(T value) throws ValidationException;
/**
* Invokes
* {@link Validator#render(Field, Object, org.apache.tapestry.ioc.MessageFormatter, MarkupWriter, PageRenderSupport)}.
- *
+ *
* @param writer
*/
void render(MarkupWriter writer);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FormValidationControl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FormValidationControl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FormValidationControl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/FormValidationControl.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
package org.apache.tapestry;
-/** Allows control over validation concerns of a Form component. */
+/**
+ * Allows control over validation concerns of a Form component.
+ */
public interface FormValidationControl
{
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Link.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,16 @@
package org.apache.tapestry;
-import java.util.List;
-
import org.apache.commons.codec.net.URLCodec;
import org.apache.tapestry.services.Dispatcher;
+import java.util.List;
+
/**
* A link is the Tapestry representation of a URL or URI that triggers dynamic behavior. This link
* is in three parts: a path portion, an optional anchor, and a set of query parameters. A request
* for a link will ultimately be recognized by a {@link Dispatcher}.
- * <p>
+ * <p/>
* Query parameter values are kept separate from the path portion to support encoding those values
* into hidden form fields (where appropriate).
*/
@@ -33,7 +33,7 @@
* Returns the names of any additional query parameters for the URI. Query parameters store less
* regular or less often used values that can not be expressed in the path. They also are used
* to store, or link to, persistent state.
- *
+ *
* @return list of query parameter names, is alphabetical order
*/
List<String> getParameterNames();
@@ -41,7 +41,7 @@
/**
* Returns the value of a specifically named query parameter, or <tt>null</tt> if no such
* query parameter is stored in the link.
- *
+ *
* @return the value of the named parameter
*/
String getParameterValue(String name);
@@ -49,20 +49,17 @@
/**
* Adds a parameter value. The value will be added, as is, to the URL. In many cases, the value
* should be URL encoded via {@link URLCodec}.
- *
- * @param parameterName
- * the name of the parameter to store
- * @param value
- * the value to store
- * @throws IllegalArgumentException
- * if the link already has a parameter with the given name
+ *
+ * @param parameterName the name of the parameter to store
+ * @param value the value to store
+ * @throws IllegalArgumentException if the link already has a parameter with the given name
*/
void addParameter(String parameterName, String value);
/**
* Returns the URI portion of the link. When the link is created for a form, this will not
* include query parameters. This is the same value returned from toString().
- *
+ *
* @return the URI, ready to be added as an element attribute
*/
String toURI();
@@ -75,16 +72,15 @@
/**
* Returns the link anchor. If this link does not have an anchor, this method returns
* <tt>null</tt>.
- *
+ *
* @return the link anchor
*/
String getAnchor();
/**
* Sets the link anchor. Null and empty anchors will be ignored when building the link URI.
- *
- * @param anchor
- * the link anchor
+ *
+ * @param anchor the link anchor
*/
void setAnchor(String anchor);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry;
-import java.io.PrintWriter;
-
import org.apache.tapestry.dom.Document;
import org.apache.tapestry.dom.Element;
import org.apache.tapestry.dom.MarkupModel;
import org.apache.tapestry.dom.Raw;
+import java.io.PrintWriter;
+
/**
* An interface used by objects, such as Tapestry components, that need to render themselves as some
* form of XML markup. A markup writer maintains the idea of a current element. Attributes are added
@@ -36,15 +36,13 @@
* Begins a new element as a child of the current element. The new element becomes the current
* element. The new Element is returned and can be directly manipulated (possibly at a later
* date). Optionally, attributes for the new element can be specified directly.
- * <p>
+ * <p/>
* If the element is intended to be clickable or submittable in the
* {@link org.apache.tapestry.test.PageTester}, you should call
* {@link #linkElement(String, Link, Object[])} instead.
- *
- * @param name
- * the name of the element to create
- * @param attributes
- * an even number of values, alternating names and values
+ *
+ * @param name the name of the element to create
+ * @param attributes an even number of values, alternating names and values
* @return the new DOM Element node
* @see #attributes(Object[])
*/
@@ -59,20 +57,22 @@
/**
* Writes the text as a child of the current element.
- * <p>
+ * <p/>
* TODO: Filtering of XML entities.
*/
void write(String text);
- /** Writes a formatted string. */
+ /**
+ * Writes a formatted string.
+ */
void writef(String format, Object... args);
/**
* Writes <em>raw</em> text, text with existing markup that should be passed through the
* client without change. This can be useful when the markup is read from an external source (a
* file or a database) and is simply to be included.
- *
+ *
* @param text
* @see Raw
*/
@@ -96,9 +96,13 @@
*/
void toMarkup(PrintWriter writer);
- /** Returns the Document into which this writer creates elements or other nodes. */
+ /**
+ * Returns the Document into which this writer creates elements or other nodes.
+ */
Document getDocument();
- /** Returns the currently active element. */
+ /**
+ * Returns the currently active element.
+ */
Element getElement();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionGroupModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionGroupModel.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionGroupModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionGroupModel.java Mon Nov 12 14:22:31 2007
@@ -23,13 +23,15 @@
*/
public interface OptionGroupModel
{
- /** Localized, user-presentable label for the group. */
+ /**
+ * Localized, user-presentable label for the group.
+ */
String getLabel();
/**
* If true, the group (and all options within it) will be disabled. Note that some browsers do
* not honor the disabled attribute property.
- *
+ *
* @return true if a disabled attribute should be rendered.
*/
boolean isDisabled();
@@ -40,6 +42,8 @@
*/
Map<String, String> getAttributes();
- /** The list of options within the group. */
+ /**
+ * The list of options within the group.
+ */
List<OptionModel> getOptions();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionModel.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/OptionModel.java Mon Nov 12 14:22:31 2007
@@ -22,13 +22,19 @@
*/
public interface OptionModel
{
- /** The localized, user-presentable label for the option. */
+ /**
+ * The localized, user-presentable label for the option.
+ */
String getLabel();
- /** If true, then a disabled attribute will be rendered with the <option>. */
+ /**
+ * If true, then a disabled attribute will be rendered with the <option>.
+ */
boolean isDisabled();
- /** Additional attributes to render within the <option>. May return null. */
+ /**
+ * Additional attributes to render within the <option>. May return null.
+ */
Map<String, String> getAttributes();
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PageRenderSupport.java Mon Nov 12 14:22:31 2007
@@ -28,9 +28,8 @@
/**
* Allocates a unique id based on the component's id. In some cases, the return value will not
* precisely match the input value (an underscore and a unique index value may be appended).
- *
- * @param id
- * the component id from which a unique id will be generated
+ *
+ * @param id the component id from which a unique id will be generated
* @return a unqiue id for this rendering of the page
* @see IdAllocator
*/
@@ -40,9 +39,8 @@
* Adds one or more new script assets to the page. Assets are added uniquely, and appear as
* <script> elements just inside the <body> element of the rendered page. Duplicate
* requests to add the same script are quietly ignored.
- *
- * @param scriptAssets
- * asset to the script to add
+ *
+ * @param scriptAssets asset to the script to add
*/
void addScriptLink(Asset... scriptAssets);
@@ -50,10 +48,9 @@
* Used to add scripts that are stored on the classpath. Each element has
* {@linkplain SymbolSource symbols expanded}, then is
* {@linkplain AssetSource converted to an asset} and added as a script link.
- *
- * @param classpaths
- * array of paths. Symbols in the paths are expanded, then the paths are each
- * converted into an asset.
+ *
+ * @param classpaths array of paths. Symbols in the paths are expanded, then the paths are each
+ * converted into an asset.
*/
void addClasspathScriptLink(String... classpaths);
@@ -61,11 +58,9 @@
* Adds a link to a CSS stylesheet. As with JavaScript libraries, each stylesheet is added at
* most once. Stylesheets added this way will be ordered before any other content in the
* <head> element of the document. The <head> element will be created, if necessary.
- *
- * @param stylesheet
- * the asset referencing the stylesheet
- * @param media
- * the media value for the stylesheet, or null to not specify a specific media type
+ *
+ * @param stylesheet the asset referencing the stylesheet
+ * @param media the media value for the stylesheet, or null to not specify a specific media type
*/
void addStylesheetLink(Asset stylesheet, String media);
@@ -73,11 +68,9 @@
/**
* Adds a script statement to the page's script block (which appears at the end of the page,
* just before the </body> tag).
- *
- * @param format
- * base string format, to be passed through String.format
- * @param arguments
- * additional arguments formatted to form the final script
+ *
+ * @param format base string format, to be passed through String.format
+ * @param arguments additional arguments formatted to form the final script
*/
void addScript(String format, Object... arguments);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PrimaryKeyEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PrimaryKeyEncoder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PrimaryKeyEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/PrimaryKeyEncoder.java Mon Nov 12 14:22:31 2007
@@ -14,20 +14,20 @@
package org.apache.tapestry;
+import org.apache.tapestry.corelib.components.Loop;
+
import java.io.Serializable;
import java.util.List;
-import org.apache.tapestry.corelib.components.Loop;
-
/**
* Used by {@link Loop} and similar components to extract out an identifier, here termed a "primary
* key", that can be stored on the client and later used to recover the same, or equivalent, server
* side object.
- *
+ *
* @param <K>
- * the type of the primary key, used to identify the value (which must be serializable)
+ * the type of the primary key, used to identify the value (which must be serializable)
* @param <V>
- * the type of value identified by the key
+ * the type of value identified by the key
*/
public interface PrimaryKeyEncoder<K extends Serializable, V>
{
@@ -35,9 +35,8 @@
* Given a particular value, this method extracts and returns the primary key that identifies
* the value. The key will later be converted back into a value using
* {@link #toValue(Serializable)}.
- *
- * @param value
- * whose primary key is needed
+ *
+ * @param value whose primary key is needed
* @return the key for the value
*/
K toKey(V value);
@@ -55,9 +54,8 @@
/**
* For a particular primary key, previously obtained via {@link #toKey(Object)}, this method
* returns the same or equivalent object.
- *
- * @param key
- * used to identify the object
+ *
+ * @param key used to identify the object
* @return the value object for the key
*/
V toValue(K key);