Modified: tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/index.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/index.apt?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/index.apt (original) +++ tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/index.apt Sat Apr 7 21:01:22 2012 @@ -26,7 +26,7 @@ Tiles integrations Tiles can be integrated with various frameworks and view technologies, to include Tiles elements into their specific features. - * {{{frameworks.html}Integration in web frameworks}}. + * {{{./frameworks.html}Integration in web frameworks}}. - * {{{view.html}Integration in view technologies}}. + * {{{./view.html}Integration in view technologies}}.
Modified: tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/view.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/view.apt?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/view.apt (original) +++ tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/integration/view.apt Sat Apr 7 21:01:22 2012 @@ -26,6 +26,6 @@ Integration with other View Technologies Currently Apache Tiles\u0099 is not only integrated with JavaServer Pages, but it can be used with: - * {{{freemarker.html}FreeMarker}}. + * {{{./freemarker.html}FreeMarker}}. - * {{{velocity.html}Velocity}}. + * {{{./velocity.html}Velocity}}. Modified: tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/pattern.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/pattern.apt?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/pattern.apt (original) +++ tiles/framework/trunk/tiles-parent/src/site/apt/tutorial/pattern.apt Sat Apr 7 21:01:22 2012 @@ -67,7 +67,7 @@ page. Tiles is a composite view framework: it allows to reuse page pieces across the application. But another approach to achieve the same result is using the <<Decorator pattern>>. For example, - {{{http://www.opensymphony.com/sitemesh/}Sitemesh}} is based on the Decorator + {{{http://www.sitemesh.org/}Sitemesh}} is based on the Decorator pattern. Instead of creating a template and organizing the pieces together, the @@ -106,4 +106,4 @@ page. Sun's Core J2EE Patterns}} * {{{http://java.sun.com/blueprints/patterns/CompositeView.html} - Sun's Blueprints Patterns}} \ No newline at end of file + Sun's Blueprints Patterns}} Modified: tiles/framework/trunk/tiles-parent/src/site/apt/whats-new.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/apt/whats-new.apt?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/src/site/apt/whats-new.apt (original) +++ tiles/framework/trunk/tiles-parent/src/site/apt/whats-new.apt Sat Apr 7 21:01:22 2012 @@ -25,100 +25,28 @@ What's new in Tiles 3.0 * New features in Tiles 3.0 - * {{{/request/}Apache Request}}: a framework independent request abstraction. Implementations for Servlet, Portlet, JSP, Velocity and FreeMarker. + * {{{/tiles-request/}Apache Request}}: a framework independent request abstraction. Implementations for Servlet, + Portlet, JSP, Velocity, FreeMarker and Mustache. - * {{{/autotag/}Apache Autotag}}: a project that automatically generates tags (or tag-like) artifact from a common template code for a range of templating languages. + * {{{/tiles-autotag/}Apache Autotag}}: a tool that automatically generates tags (or tag-like) artifact from a common template code for a range of templating languages. All the Tiles 3 boilerplate code to templating models has been removed and uses the Autotag plugins instead: it's a lot of boilerplate, boring code, now generated automatically. * Deprecations in Tiles 3.0 - ...todo... - -What's new in Tiles 2.2 - - Tiles 2.2 is a binary-compatible enhancement of Tiles 2.1.x, with some incompatible changes in JSP tags, - but, for the user perspective, it is perfectly compatible. - -* New features in Tiles 2.2 - - Tiles 2.2 has several new features: - - * {{{tutorial/integration/freemarker.html}Native support for FreeMarker}}, - instead of a support based on JSP. - - * {{{tutorial/integration/velocity.html}Support for Velocity}}. - - * Support for pattern matching using - {{{tutorial/advanced/wildcard.html#Using_different_pattern_matching_languages}regular expressions}}. - - * {{{tutorial/advanced/el-support.html#OGNL_Support}OGNL support}} - and - {{{tutorial/advanced/el-support.html#MVEL_Support}MVEL support}} - in Tiles definition files, when specifying attributes and templates. - - * Ready to use {{{tutorial/configuration.html#Ready-made_configuration_classes}configuration classes}} to ease startup with minimal coding. - -* Deprecations in Tiles 2.2 - - * Startup with initialization parameters is not <<deprecated>>. See the - {{{tutorial/configuration.html}configuration}} page to know how to configure - Tiles with Java. - -* Removals in Tiles 2.2 - - * Support of retrotranslated packages to be compatible with Java 1.4. It is possible, - though, to retrotranslate the packages manually. - - * Support for Servlets 2.4 and JSP 2.0 when creating <<<ELAttributeEvaluator>>>. - {{{tutorial/advanced/el-support.html}It is still possible to use it manually}}. - -* New features in Tiles 2.1 - - Tiles 2.1 introduces new features, but remaining compatible to Tiles 2.0.x. - The new features are: - - * {{{tutorial/advanced/nesting-extending.html#Anonymous_nested_definitions}Anonymous nested definitions}}: - now definitions can be put just as an attribute in an enclosing definition, - without the necessity to define a new named definition to use only once. - - * <<Wildcard support>>: wildcards are supported: - - ** in {{{tutorial/advanced/wildcard.html}XML definition files}}; - - ** when enumerating the {{{tutorial/wildcard-configuration.html}list of Tiles definition files to load}}. - - * {{{tutorial/advanced/el-support.html}EL support}} in Tiles definition files, when specifying attributes and - templates. - - * Ability to - {{{migration/configuration.html#Reusing_old_Tiles_configuration_files}load Tiles 1.x definition files}}. - - * {{{tutorial/configuration.html#Pure_Java_configuration}Pure Java configuration}}, - except for the configuration of the Tiles container factory. - - * List attributes can now - {{{tutorial/advanced/list-attributes.html#List_attribute_inheritance}inherit members from the extending definition}}. - - * Attribute values can be - {{{tutorial/advanced/nesting-extending.html#Cascaded_attributes}cascaded to nested definitions}}, - so the configuration is easier to write. - - * Ability to - {{{tutorial/advanced/runtime.html#Inserting_modified_definitions}override the template when inserting definitions}}. - - * Customize {{{tutorial/advanced/attribute-rendering.html}rendering of attributes}}, - for example to write integrations with other frameworks. - - * Usage of {{{tutorial/advanced/multiple-containers.html}more than one Tiles container}}. - -** Under the hood - - * <<<TilesApplicationContext>>> is now created externally of the Tiles - container and {{{tutorial/extension/points.html#Tiles_Application_Context_Factory}must be configured externally}}. - - * Tiles exceptions are all unchecked now: you can now remove all your - try-catches. - - * Added the concept of "definition DAO" that allows loading definitions from - various sources, for example a DB. + * Starting Tiles in a web environment using a dummy Servlet. Use a SerlvetContextListener instead. + + * Don't use the AttributeContext interface to pass attribute values to Tiles. Expression Languages are an easier, more maintainable + way to change the value of attributes on a per-render basis. + + * ... + +* Removals in Tiles 3.0 + + * Upgraded from JavaSE 5.0 to JavaSE 6.0. + + * Upgraded from Servlet 2.4 and JSP 2.0 to Servlet 2.5 and JSP 2.1. + + * Changed the Java API to adopt the Request API. The XML files and taglibs are compatible with tiles 2.2. + + * Dropped the parameter based configuration that was deprecated in 2.2. Modified: tiles/framework/trunk/tiles-parent/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/site.xml?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-parent/src/site/site.xml Sat Apr 7 21:01:22 2012 @@ -56,9 +56,6 @@ name="What's new" href="whats-new.html"/> <item - name="Getting Started" - href="getting_started.html"/> - <item name="Tutorial" href="tutorial/index.html" collapse="true"> @@ -69,9 +66,6 @@ name="Configuration" href="tutorial/configuration.html"/> <item - name="Wildcards in configuration files" - href="tutorial/wildcard-configuration.html"/> - <item name="Basic Usage" href="tutorial/basic/index.html" collapse="true"> @@ -138,35 +132,19 @@ href="tutorial/integration/velocity.html"/> </item> </item> - <item - name="Extensions" - href="tutorial/extension/index.html" - collapse="true"> - <item - name="Extension Points" - href="tutorial/extension/points.html"/> - <item - name="Template languages" - href="tutorial/extension/template.html"/> - <item - name="UrlDefinitionsFactory" - href="tutorial/extension/url_definitions_factory.html"/> - </item> - <item - name="Migration from Struts Tiles" - href="migration/index.html"/> </item> <item - name="HOW-TOs" - href="how-to/index.html" - collapse="true"> - <item - name="Loading definitions from a database" - href="how-to/definitions-db.html"/> - </item> + name="Wiki" + href="http://cwiki.apache.org/TILES/"/> + <item + name="Migration" + href="migration/index.html"/> </menu> <menu name="Reference"> <item + name="Getting Started" + href="getting_started.html"/> + <item name="Configuration reference" href="config-reference.html"/> <item Modified: tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/building.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/building.xml?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/building.xml (original) +++ tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/building.xml Sat Apr 7 21:01:22 2012 @@ -43,43 +43,25 @@ <subsection name="Building main packages"> <p>To build Tiles from source you need to:</p> <ul> - <li><p><a href="../download.html">download</a> the source + <li><p><a href="/download.html">download</a> the source distribution, or checkout the latest version:</p> - <p><source>svn co http://svn.apache.org/repos/asf/tiles/framework/trunk/</source></p></li> + <p><source>svn co http://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-parent</source></p></li> <li><p>go into the source directory and type:</p> <p><source>mvn package</source></p></li> </ul> <p>You will find the generated JARs under:</p> <ul> - <li>{tiles-dir}/tiles-api/target/tiles-api-${version}.jar</li> - <li>{tiles-dir}/tiles-core/target/tiles-core-${version}.jar</li> - <li>{tiles-dir}/tiles-jsp/target/tiles-jsp-${version}.jar</li> + <li>{tiles-dir}/tiles-{module}/target/tiles-{module}-${version}.jar</li> </ul> </subsection> <subsection name="Building Tiles Test webapp"> <p>See <a href="../selenium.html">Selenium testing with Tiles Test webapp</a>.</p> </subsection> - <subsection name="Building Tiles Showcase"> - <p>To build Tiles Showcase from source you need to:</p> - <ul> - <li><p><a href="../download.html">download</a> the source - distribution, or checkout the latest version:</p> - <p><source>svn co http://svn.apache.org/repos/asf/tiles/examples/trunk/tiles-showcase/</source></p></li> - <li><p>go into the source directory and type:</p> - <p><source>mvn package</source></p></li> - </ul> - <p>You will find the generated JARs under - <code>{tiles-showcase-dir}/target/tiles-showcase-${version}.jar</code>.</p> - <p>You can also see the showcase in action by using the Cargo plugin:</p> - <source>mvn package cargo:start</source> - <p>or</p> - <source>mvn package cargo:start -Dcargo.tomcat5x.home=/path/to/tomcat5</source> - </subsection> <subsection name="Building distributions"> <p>To build distributions, you need to:</p> <ul> - <li><p><a href="../download.html">download</a> the source + <li><p><a href="/download.html">download</a> the source distribution, or checkout the latest version:</p> <p><source>svn co http://svn.apache.org/repos/asf/tiles/framework/trunk/</source></p></li> <li><p>go into the source directory and type:</p> @@ -93,8 +75,8 @@ </subsection> </section> <section name="Building Tiles websites"> - <p>There are two Tiles websites: the main website and the framework - website.</p> + <p>There are four Tiles websites: the main website and the projects + websitesi (tiles-request, tiles-autotag, framework).</p> <subsection name="Building main website"> <p>To build the main website:</p> <ul> @@ -106,21 +88,18 @@ <p>You will find the generated distribution under <code>{tiles-site-dir}/target/site</code>.</p> </subsection> - <subsection name="Building framework website"> + <subsection name="Building a project's website"> <p>To build the framework website:</p> <ul> - <li><p><a href="../download.html">download</a> the source + <li><p><a href="/download.html">download</a> the source distribution, or checkout the latest version:</p> - <p><source>svn co http://svn.apache.org/repos/asf/tiles/framework/trunk/</source></p></li> + <p><source>svn co http://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-parent/</source></p></li> <li><p>go into the source directory and type:</p> - <p><source>mvn site</source></p></li> + <p><source>mvn site site:stage</source></p></li> </ul> - <p>You will find the generated websites under:</p> + <p>You will find the generated website under:</p> <ul> - <li>{tiles-dir}/target/site</li> - <li>{tiles-dir}/tiles-api/target/site</li> - <li>{tiles-dir}/tiles-core/target/site</li> - <li>{tiles-dir}/tiles-jsp/target/site</li> + <li>{tiles-dir}/target/staging</li> </ul> </subsection> </section> Modified: tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/snapshots.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/snapshots.xml?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/snapshots.xml (original) +++ tiles/framework/trunk/tiles-parent/src/site/xdoc/dev/snapshots.xml Sat Apr 7 21:01:22 2012 @@ -32,7 +32,7 @@ <subsection name="Snapshots"> <p>Looking for snapshot builds of the latest version of Tiles? - Snapshots are occasionally published to Apache's Maven 2 snapshot + Snapshots are occasionally published to Apache's Maven snapshot repository, which can be accessed with the following configuration:</p> <source> @@ -40,7 +40,7 @@ <repository> <id>apache.snapshots</id> <name>Apache Maven Snapshot Repository</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <url>http://repository.apache.org/snapshots</url> </repository> ]]> </source> @@ -52,19 +52,13 @@ <dependency> <groupId>org.apache.tiles</groupId> <artifactId>tiles-core</artifactId> - <version>2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </dependency> ]]> </source> - <p>If you are not using Maven 2, you can find a recent development - snapshot of tiles-core.jar <a - href="http://people.apache.org/maven-snapshot-repository/org/apache/struts/tiles/tiles-core/";> - here</a>, or a nightly build, <a - href="http://people.apache.org/builds/struts/nightlies/tiles/";>here</a>.</p> - <p>You can see Tiles in action by downloading a snapshot of the 'tiles-test' webapp, - <a href="http://people.apache.org/repo/m2-snapshot-repository/org/apache/struts/tiles/tiles-test/2.0-SNAPSHOT/";> + <a href="http://repository.apache.org/snapshots/org/apache/tiles/tiles-test/3.0.0-SNAPSHOT";> here</a>.</p> </subsection> Copied: tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerException.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java?p2=tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerException.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerException.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java Sat Apr 7 21:01:22 2012 @@ -22,6 +22,7 @@ package org.apache.tiles.preparer; import org.apache.tiles.TilesException; + /** * <p> * Thrown when an exception occurs while processing Copied: tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java?p2=tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java Sat Apr 7 21:01:22 2012 @@ -20,8 +20,8 @@ */ package org.apache.tiles.preparer; -import org.apache.tiles.request.Request; import org.apache.tiles.AttributeContext; +import org.apache.tiles.request.Request; /** * <p> Copied: tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/package-info.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/package-info.java?p2=tiles/framework/trunk/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/package-info.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== (empty) Copied: tiles/framework/trunk/tiles-parent/tiles-api/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-api/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java?p2=tiles/framework/trunk/tiles-parent/tiles-api/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== (empty) Modified: tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java Sat Apr 7 21:01:22 2012 @@ -21,8 +21,8 @@ package org.apache.tiles.compat.preparer; -import org.apache.tiles.preparer.BasicPreparerFactory; import org.apache.tiles.preparer.ViewPreparer; +import org.apache.tiles.preparer.factory.BasicPreparerFactory; /** * Factory used to instantiate preparers in a Struts 1 / Tiles 2 environment. Modified: tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java Sat Apr 7 21:01:22 2012 @@ -31,7 +31,7 @@ import org.apache.tiles.request.Dispatch /** * Uses a URL that acts as a preparer. When - * {@link org.apache.tiles.preparer.ViewPreparer#execute(Request, AttributeContext)} + * {@link org.apache.tiles.preparer.factory.factory.ViewPreparer#execute(Request, AttributeContext)} * is called, the URL is got, but its response is discarded. * * @version $Rev$ $Date$ Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Sat Apr 7 21:01:22 2012 @@ -42,8 +42,8 @@ import org.apache.tiles.evaluator.impl.D import org.apache.tiles.impl.BasicTilesContainer; import org.apache.tiles.locale.LocaleResolver; import org.apache.tiles.locale.impl.DefaultLocaleResolver; -import org.apache.tiles.preparer.BasicPreparerFactory; -import org.apache.tiles.preparer.PreparerFactory; +import org.apache.tiles.preparer.factory.BasicPreparerFactory; +import org.apache.tiles.preparer.factory.PreparerFactory; import org.apache.tiles.renderer.DefinitionRenderer; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.ApplicationResource; Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Sat Apr 7 21:01:22 2012 @@ -35,9 +35,9 @@ import org.apache.tiles.definition.NoSuc import org.apache.tiles.evaluator.AttributeEvaluator; import org.apache.tiles.evaluator.AttributeEvaluatorFactory; import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware; -import org.apache.tiles.preparer.NoSuchPreparerException; -import org.apache.tiles.preparer.PreparerFactory; import org.apache.tiles.preparer.ViewPreparer; +import org.apache.tiles.preparer.factory.NoSuchPreparerException; +import org.apache.tiles.preparer.factory.PreparerFactory; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; import org.apache.tiles.request.render.CannotRenderException; Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java Sat Apr 7 21:01:22 2012 @@ -18,11 +18,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tiles.preparer; +package org.apache.tiles.preparer.factory; import java.util.HashMap; import java.util.Map; +import org.apache.tiles.preparer.ViewPreparer; import org.apache.tiles.request.Request; import org.apache.tiles.request.reflect.ClassUtil; import org.slf4j.Logger; Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/NoSuchPreparerException.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/NoSuchPreparerException.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/NoSuchPreparerException.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java Sat Apr 7 21:01:22 2012 @@ -18,7 +18,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tiles.preparer; +package org.apache.tiles.preparer.factory; + +import org.apache.tiles.preparer.PreparerException; /** * Thrown when the named preparerInstance can not be found. Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java Sat Apr 7 21:01:22 2012 @@ -18,8 +18,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tiles.preparer; +package org.apache.tiles.preparer.factory; +import org.apache.tiles.preparer.ViewPreparer; import org.apache.tiles.request.Request; /** Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java Sat Apr 7 21:01:22 2012 @@ -24,5 +24,5 @@ * It is useful, for example, when a view item should be built and stored in a * particular context (e.g. a menu) and then rendered. */ -package org.apache.tiles.preparer; +package org.apache.tiles.preparer.factory; Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java Sat Apr 7 21:01:22 2012 @@ -37,8 +37,8 @@ import org.apache.tiles.evaluator.impl.D import org.apache.tiles.impl.BasicTilesContainer; import org.apache.tiles.locale.LocaleResolver; import org.apache.tiles.locale.impl.DefaultLocaleResolver; -import org.apache.tiles.preparer.BasicPreparerFactory; -import org.apache.tiles.preparer.PreparerFactory; +import org.apache.tiles.preparer.factory.BasicPreparerFactory; +import org.apache.tiles.preparer.factory.PreparerFactory; import org.apache.tiles.renderer.DefinitionRenderer; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.ApplicationResource; Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java Sat Apr 7 21:01:22 2012 @@ -37,9 +37,9 @@ import org.apache.tiles.definition.Defin import org.apache.tiles.definition.NoSuchDefinitionException; import org.apache.tiles.evaluator.AttributeEvaluator; import org.apache.tiles.evaluator.AttributeEvaluatorFactory; -import org.apache.tiles.preparer.NoSuchPreparerException; -import org.apache.tiles.preparer.PreparerFactory; import org.apache.tiles.preparer.ViewPreparer; +import org.apache.tiles.preparer.factory.NoSuchPreparerException; +import org.apache.tiles.preparer.factory.PreparerFactory; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.Request; import org.apache.tiles.request.render.CannotRenderException; Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java Sat Apr 7 21:01:22 2012 @@ -18,9 +18,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tiles.preparer; +package org.apache.tiles.preparer.factory; import org.apache.tiles.AttributeContext; +import org.apache.tiles.preparer.ViewPreparer; import org.apache.tiles.request.Request; import junit.framework.TestCase; Copied: tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java (from r1310864, tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/NoSuchPreparerExceptionTest.java) URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java?p2=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java&p1=tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/NoSuchPreparerExceptionTest.java&r1=1310864&r2=1310865&rev=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/NoSuchPreparerExceptionTest.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java Sat Apr 7 21:01:22 2012 @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.tiles.preparer; +package org.apache.tiles.preparer.factory; import static org.junit.Assert.*; Modified: tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java Sat Apr 7 21:01:22 2012 @@ -31,10 +31,12 @@ import org.apache.tiles.web.util.Servlet * Abstract Initialization Servlet. Uses a {@link TilesInitializer}, created by * {@link #createTilesInitializer()} to initialize Tiles. * + * @deprecated use {@link AbstractTilesListener} instead. * @see org.apache.tiles.web.startup.TilesListener * @version $Rev$ $Date$ * @since 2.2.0 */ +@Deprecated public abstract class AbstractTilesInitializerServlet extends HttpServlet { /** Modified: tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java?rev=1310865&r1=1310864&r2=1310865&view=diff ============================================================================== --- tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java (original) +++ tiles/framework/trunk/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java Sat Apr 7 21:01:22 2012 @@ -28,9 +28,11 @@ import org.apache.tiles.web.startup.Abst /** * A Tiles listener that loads Tiles in the default way. * + * @deprecated use {@link SimpleTilesListener} instead. * @version $Rev$ $Date$ * @since 2.2.0 */ +@Deprecated public class SimpleTilesInitializerServlet extends AbstractTilesInitializerServlet { /** {@inheritDoc} */
