You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2006/12/12 13:33:44 UTC
svn commit: r486112 [1/2] - in /struts/struts1/trunk/tiles2: ./
src/main/java/org/apache/struts/tiles/
src/main/java/org/apache/struts/tiles/actions/
src/main/java/org/apache/struts/tiles/beans/
src/main/java/org/apache/struts/tiles/commands/ src/main/...
Author: apetrelli
Date: Tue Dec 12 04:33:33 2006
New Revision: 486112
URL: http://svn.apache.org/viewvc?view=rev&rev=486112
Log:
STR-2986
Modified "pom.xml".
Refactored main package name.
Refactored "DefinitionsDispatcherAction"
Added:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ActionController.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ActionController.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/AttributeDefinition.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/AttributeDefinition.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentContext.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentContext.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinition.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinition.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinitionsFactory.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/Controller.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/Controller.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ControllerSupport.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ControllerSupport.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionAttribute.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionNameAttribute.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactory.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryConfig.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryException.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsUtil.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DirectStringAttribute.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/FactoryNotFoundException.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/NoSuchDefinitionException.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/PathAttribute.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/PathAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/RedeployableActionServlet.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/RedeployableActionServlet.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesException.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesPlugin.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtil.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtil.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilImpl.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsImpl.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsModulesImpl.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UntypedAttribute.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UntypedAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UrlController.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UrlController.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/actions/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/beans/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/commands/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/definition/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/doc-files/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/doc-files/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/package.html
- copied unchanged from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/package.html
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTagParent.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AttributeToScopeTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ComponentConstants.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTagSupport.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetAttributeTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ImportAttributeTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InitDefinitionsTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InsertTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InsertTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTagParent.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTagParent.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.java
- copied, changed from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/doc-files/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/doc-files/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/package.html
- copied unchanged from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/package.html
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/util/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/
- copied from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/xmlDefinition/
Removed:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ActionController.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/AttributeDefinition.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentContext.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinition.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/Controller.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ControllerSupport.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/PathAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/RedeployableActionServlet.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesException.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesPlugin.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtil.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UntypedAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UrlController.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/actions/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/beans/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/commands/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/definition/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/doc-files/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/package.html
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InsertTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/doc-files/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/package.html
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/util/
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/xmlDefinition/
Modified:
struts/struts1/trunk/tiles2/pom.xml
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ViewDefinitionsAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/MenuItem.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/SimpleMenuItem.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ComponentDefinitionsFactoryWrapper.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ReloadableDefinitionsFactory.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/FactorySet.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/I18nFactorySet.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinition.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinitionsSet.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlListAttribute.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlParser.java
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java
Modified: struts/struts1/trunk/tiles2/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?view=diff&rev=486112&r1=486111&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/pom.xml (original)
+++ struts/struts1/trunk/tiles2/pom.xml Tue Dec 12 04:33:33 2006
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.struts</groupId>
- <artifactId>struts-tiles</artifactId>
+ <artifactId>struts-tiles2</artifactId>
<packaging>jar</packaging>
<name>Struts Tiles</name>
<url>http://struts.apache.org</url>
@@ -85,6 +85,18 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
<version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ActionController.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ActionController.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ActionController.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ActionController.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ActionController.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ActionController.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ActionController.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
@@ -76,7 +76,7 @@
}
/**
- * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+ * @see org.apache.struts.tiles2.Controller#execute(org.apache.struts.tiles2.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
*/
public void execute(
ComponentContext tileContext,
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/AttributeDefinition.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/AttributeDefinition.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/AttributeDefinition.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/AttributeDefinition.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/AttributeDefinition.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/AttributeDefinition.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/AttributeDefinition.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.Serializable;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentContext.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentContext.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentContext.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentContext.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentContext.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentContext.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentContext.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.Serializable;
import java.util.Collections;
@@ -31,7 +31,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.jsp.PageContext;
-import org.apache.struts.tiles.taglib.ComponentConstants;
+import org.apache.struts.tiles2.taglib.ComponentConstants;
/**
* Component context.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinition.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinition.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinition.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinition.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinition.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinition.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinition.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.Serializable;
import java.util.HashMap;
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.xmlDefinition.XmlDefinition;
+import org.apache.struts.tiles2.xmlDefinition.XmlDefinition;
import org.apache.struts.util.RequestUtils;
/**
@@ -473,7 +473,7 @@
* Otherwise, consider name as an url.
* @param name Controller name (classname, url, ...)
* @param controllerType Expected Controller type
- * @return org.apache.struts.tiles.Controller
+ * @return org.apache.struts.tiles2.Controller
* @throws InstantiationException if an error occur while instanciating Controller :
* (classname can't be instanciated, Illegal access with instanciated class,
* Error while instanciating class, classname can't be instanciated.
@@ -508,7 +508,7 @@
/**
* Create a controller from specified classname
* @param classname Controller classname.
- * @return org.apache.struts.tiles.Controller
+ * @return org.apache.struts.tiles2.Controller
* @throws InstantiationException if an error occur while instanciating Controller :
* (classname can't be instanciated, Illegal access with instanciated class,
* Error while instanciating class, classname can't be instanciated.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinitionsFactory.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinitionsFactory.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinitionsFactory.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ComponentDefinitionsFactory.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.Serializable;
import java.util.Map;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/Controller.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/Controller.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/Controller.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/Controller.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/Controller.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/Controller.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/Controller.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ControllerSupport.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ControllerSupport.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ControllerSupport.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ControllerSupport.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ControllerSupport.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/ControllerSupport.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/ControllerSupport.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
@@ -55,7 +55,7 @@
}
/**
- * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+ * @see org.apache.struts.tiles2.Controller#execute(org.apache.struts.tiles2.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
*/
public void execute(
ComponentContext tileContext,
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionAttribute.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionAttribute.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionAttribute.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionAttribute.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Attribute representing a Component Definition.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionNameAttribute.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionNameAttribute.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionNameAttribute.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionNameAttribute.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Component attribute.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactory.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactory.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactory.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactory.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.Serializable;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryConfig.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryConfig.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryConfig.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryConfig.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
@@ -42,10 +42,10 @@
/**
* Fully qualified classname of the factory to create.
* If no classname is set, a default factory is created
- * (of class "org.apache.struts.tiles.xmlDefinition.I18nFactorySet").
+ * (of class "org.apache.struts.tiles2.xmlDefinition.I18nFactorySet").
*/
protected String factoryClassname =
- "org.apache.struts.tiles.xmlDefinition.I18nFactorySet";
+ "org.apache.struts.tiles2.xmlDefinition.I18nFactorySet";
/**
* Specifies whether the parser will validate configuration files.
@@ -223,7 +223,7 @@
map.put(PARSER_DETAILS_PARAMETER_NAME, Integer.toString(getParserDebugLevel()) );
map.put(PARSER_VALIDATE_PARAMETER_NAME, new Boolean(getParserValidate()).toString() );
- if( ! "org.apache.struts.tiles.xmlDefinition.I18nFactorySet".equals(getFactoryClassname()) )
+ if( ! "org.apache.struts.tiles2.xmlDefinition.I18nFactorySet".equals(getFactoryClassname()) )
map.put(FACTORY_CLASSNAME_PARAMETER_NAME, getFactoryClassname());
*/
return map;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryException.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryException.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryException.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsFactoryException.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Exception thrown when an error occurs while the factory tries to
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsUtil.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsUtil.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsUtil.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DefinitionsUtil.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.lang.reflect.InvocationTargetException;
import java.util.Enumeration;
@@ -32,7 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.taglib.ComponentConstants;
+import org.apache.struts.tiles2.taglib.ComponentConstants;
/**
* Utilities class for definitions factory.
@@ -74,14 +74,14 @@
* Constant name used to store factory in context.
*/
public static final String DEFINITIONS_FACTORY =
- "org.apache.struts.tiles.DEFINITIONS_FACTORY";
+ "org.apache.struts.tiles2.DEFINITIONS_FACTORY";
/**
* Constant name used to store definition in jsp context.
* Used to pass definition from a Struts action to servlet forward.
*/
public static final String ACTION_DEFINITION =
- "org.apache.struts.tiles.ACTION_DEFINITION";
+ "org.apache.struts.tiles2.ACTION_DEFINITION";
/**
* Create Definition factory.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DirectStringAttribute.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DirectStringAttribute.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DirectStringAttribute.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/DirectStringAttribute.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Component attribute.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/FactoryNotFoundException.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/FactoryNotFoundException.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/FactoryNotFoundException.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/FactoryNotFoundException.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Exception thrown when definitions factory is not found.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/NoSuchDefinitionException.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/NoSuchDefinitionException.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/NoSuchDefinitionException.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/NoSuchDefinitionException.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Exception thrown when a definition is not found.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/PathAttribute.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/PathAttribute.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/PathAttribute.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/PathAttribute.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/PathAttribute.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/PathAttribute.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/PathAttribute.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Component attribute.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/RedeployableActionServlet.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/RedeployableActionServlet.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/RedeployableActionServlet.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/RedeployableActionServlet.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/RedeployableActionServlet.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/RedeployableActionServlet.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/RedeployableActionServlet.java Tue Dec 12 04:33:33 2006
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import javax.servlet.ServletException;
@@ -26,9 +26,9 @@
import org.apache.struts.action.ActionServlet;
import org.apache.struts.action.RequestProcessor;
import org.apache.struts.config.ModuleConfig;
-import org.apache.struts.tiles.DefinitionsFactory;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.TilesRequestProcessor;
+import org.apache.struts.tiles2.DefinitionsFactory;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.TilesRequestProcessor;
/**
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesException.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesException.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesException.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesException.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesException.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesException.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesException.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesPlugin.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesPlugin.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesPlugin.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.util.Map;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtil.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtil.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtil.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtil.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtil.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtil.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtil.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilImpl.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilImpl.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilImpl.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilImpl.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
import java.io.Serializable;
@@ -36,7 +36,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.definition.ComponentDefinitionsFactoryWrapper;
+import org.apache.struts.tiles2.definition.ComponentDefinitionsFactoryWrapper;
import org.apache.struts.util.RequestUtils;
/**
@@ -51,7 +51,7 @@
/** Constant name used to store factory in servlet context */
public static final String DEFINITIONS_FACTORY =
- "org.apache.struts.tiles.DEFINITIONS_FACTORY";
+ "org.apache.struts.tiles2.DEFINITIONS_FACTORY";
/**
* JSP 2.0 include method to use which supports configurable flushing.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsImpl.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsImpl.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsImpl.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsImpl.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import javax.servlet.ServletContext;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsModulesImpl.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsModulesImpl.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsModulesImpl.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesUtilStrutsModulesImpl.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UntypedAttribute.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UntypedAttribute.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UntypedAttribute.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UntypedAttribute.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UntypedAttribute.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UntypedAttribute.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UntypedAttribute.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
/**
* Common implementation of attribute definition.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UrlController.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UrlController.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UrlController.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UrlController.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UrlController.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/UrlController.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/UrlController.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.struts.tiles2;
import java.io.IOException;
@@ -74,7 +74,7 @@
}
/**
- * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+ * @see org.apache.struts.tiles2.Controller#execute(org.apache.struts.tiles2.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
*/
public void execute(
ComponentContext tileContext,
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java Tue Dec 12 04:33:33 2006
@@ -19,10 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.actions;
-
-import java.io.IOException;
-import java.io.PrintWriter;
+package org.apache.struts.tiles2.actions;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,12 +30,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.DefinitionsUtil;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
-import org.apache.struts.tiles.TilesUtil;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
/**
* <p>An <strong>Action</strong> that dispatches to a Tiles Definition
@@ -55,7 +48,7 @@
*
* <code>
* <action path="/saveSubscription"
- * type="org.apache.struts.tiles.actions.DefinitionDispatcherAction"
+ * type="org.apache.struts.tiles2.actions.DefinitionDispatcherAction"
* parameter="def"/>
* <forward name="success" path="anything" //>
* <forward name="error" path="path.to.error.page" //>
@@ -113,50 +106,18 @@
}
// Try to dispatch to requested definition
- try {
- // Read definition from factory, but we can create it here.
- ComponentDefinition definition =
- TilesUtil.getDefinition(
- name,
- request,
- getServlet().getServletContext());
-
- if (log.isDebugEnabled()) {
- log.debug("Get Definition " + definition);
- }
-
- DefinitionsUtil.setActionDefinition(request, definition);
-
- } catch (FactoryNotFoundException e) {
- log.error("Can't get definition factory.", e);
- return mapping.findForward("error");
-
- } catch (NoSuchDefinitionException e) {
- log.error("Can't get definition '" + name + "'.", e);
- return mapping.findForward("error");
-
- } catch (DefinitionsFactoryException e) {
- log.error("General Factory error '" + e.getMessage() + "'.", e);
- return mapping.findForward("error");
-
- } catch (Exception e) {
- log.error("General error '" + e.getMessage() + "'.", e);
+ // Read definition from factory, but we can create it here.
+ TilesContainer container = TilesAccess.getContainer(request
+ .getSession().getServletContext());
+ if (container != null && container.isValidDefinition(request, response,
+ name)) {
+ container.render(request, response, name);
+ } else {
+ log.error("Can't get definition '" + name + "'.");
return mapping.findForward("error");
}
return mapping.findForward("success");
- }
-
- /**
- * @deprecated This will be removed after Struts 1.2.
- */
- protected void printError(HttpServletResponse response, String msg)
- throws IOException {
- response.setContentType("text/plain");
- PrintWriter writer = response.getWriter();
- writer.println(msg);
- writer.flush();
- writer.close();
}
}
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ReloadDefinitionsAction.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles.actions;
+package org.apache.struts.tiles2.actions;
import java.io.PrintWriter;
@@ -32,9 +32,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.DefinitionsFactory;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.TilesUtil;
+import org.apache.struts.tiles2.DefinitionsFactory;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.TilesUtil;
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.actions;
+package org.apache.struts.tiles2.actions;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -29,7 +29,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.struts.tiles2.ComponentContext;
/**
* Base class for Tiles Actions.
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ViewDefinitionsAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ViewDefinitionsAction.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ViewDefinitionsAction.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/ViewDefinitionsAction.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles.actions;
+package org.apache.struts.tiles2.actions;
import java.io.PrintWriter;
@@ -32,8 +32,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.DefinitionsFactory;
-import org.apache.struts.tiles.TilesUtil;
+import org.apache.struts.tiles2.DefinitionsFactory;
+import org.apache.struts.tiles2.TilesUtil;
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/MenuItem.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/MenuItem.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/MenuItem.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/MenuItem.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.beans;
+package org.apache.struts.tiles2.beans;
import java.io.Serializable;
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/SimpleMenuItem.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/SimpleMenuItem.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/SimpleMenuItem.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/beans/SimpleMenuItem.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.beans;
+package org.apache.struts.tiles2.beans;
import java.io.Serializable;
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java Tue Dec 12 04:33:33 2006
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts.tiles.commands;
+package org.apache.struts.tiles2.commands;
import java.io.IOException;
@@ -33,13 +33,13 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts.chain.contexts.ServletActionContext;
import org.apache.struts.config.ForwardConfig;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.Controller;
-import org.apache.struts.tiles.DefinitionsUtil;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
-import org.apache.struts.tiles.TilesUtil;
+import org.apache.struts.tiles2.ComponentContext;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.Controller;
+import org.apache.struts.tiles2.DefinitionsUtil;
+import org.apache.struts.tiles2.FactoryNotFoundException;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
+import org.apache.struts.tiles2.TilesUtil;
import org.apache.struts.upload.MultipartRequestWrapper;
@@ -57,7 +57,7 @@
*
* <p>To initialize the <code>TilesDefinitionFactory</code>, use
* <code>org.apache.struts.chain.commands.legacy.TilesPlugin</code>. This class
- * is a simple extension to <code>org.apache.struts.tiles.TilesPlugin</code>
+ * is a simple extension to <code>org.apache.struts.tiles2.TilesPlugin</code>
* which simply does not interfere with your choice of <code>RequestProcessor</code>
* implementation.
* </p>
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ComponentDefinitionsFactoryWrapper.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ComponentDefinitionsFactoryWrapper.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ComponentDefinitionsFactoryWrapper.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ComponentDefinitionsFactoryWrapper.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.definition;
+package org.apache.struts.tiles2.definition;
import java.util.HashMap;
import java.util.Map;
@@ -27,12 +27,12 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.ComponentDefinitionsFactory;
-import org.apache.struts.tiles.DefinitionsFactory;
-import org.apache.struts.tiles.DefinitionsFactoryConfig;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.ComponentDefinitionsFactory;
+import org.apache.struts.tiles2.DefinitionsFactory;
+import org.apache.struts.tiles2.DefinitionsFactoryConfig;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
import org.apache.struts.util.RequestUtils;
/**
@@ -210,7 +210,7 @@
DefinitionsFactoryConfig.PARSER_VALIDATE_PARAMETER_NAME,
(config.getParserValidate() ? Boolean.TRUE.toString() : Boolean.FALSE.toString()));
- if (!"org.apache.struts.tiles.xmlDefinition.I18nFactorySet"
+ if (!"org.apache.struts.tiles2.xmlDefinition.I18nFactorySet"
.equals(config.getFactoryClassname())) {
map.put(
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ReloadableDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ReloadableDefinitionsFactory.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ReloadableDefinitionsFactory.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/definition/ReloadableDefinitionsFactory.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.definition;
+package org.apache.struts.tiles2.definition;
import java.util.Enumeration;
import java.util.HashMap;
@@ -30,11 +30,11 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.ComponentDefinitionsFactory;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.ComponentDefinitionsFactory;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.FactoryNotFoundException;
+import org.apache.struts.tiles2.xmlDefinition.I18nFactorySet;
import org.apache.struts.util.RequestUtils;
/**
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTag.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import javax.servlet.jsp.JspException;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTagParent.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTagParent.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTagParent.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AddTagParent.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AddTagParent.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import javax.servlet.jsp.JspException;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AttributeToScopeTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AttributeToScopeTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AttributeToScopeTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/AttributeToScopeTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/AttributeToScopeTag.java Tue Dec 12 04:33:33 2006
@@ -19,14 +19,14 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.tiles.taglib.util.TagUtils;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.struts.tiles2.ComponentContext;
+import org.apache.struts.tiles2.taglib.util.TagUtils;
/**
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ComponentConstants.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ComponentConstants.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ComponentConstants.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ComponentConstants.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ComponentConstants.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import org.apache.struts.Globals;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTag.java Tue Dec 12 04:33:33 2006
@@ -19,14 +19,14 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import javax.servlet.jsp.JspException;
-import org.apache.struts.tiles.taglib.util.TagUtils;
-import org.apache.struts.tiles.AttributeDefinition;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.UntypedAttribute;
+import org.apache.struts.tiles2.AttributeDefinition;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.UntypedAttribute;
+import org.apache.struts.tiles2.taglib.util.TagUtils;
/**
* This is the tag handler for <tiles:definition>, which defines
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTagSupport.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTagSupport.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTagSupport.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/DefinitionTagSupport.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/DefinitionTagSupport.java Tue Dec 12 04:33:33 2006
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import java.io.Serializable;
import javax.servlet.jsp.tagext.TagSupport;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetAttributeTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetAttributeTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetAttributeTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetAttributeTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetAttributeTag.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import java.io.IOException;
@@ -29,7 +29,7 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.struts.tiles2.ComponentContext;
/**
* Retrieve the value of the specified component/template attribute property,
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/GetTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/GetTag.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
/**
* This is the tag handler for <tiles:get>, which gets
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ImportAttributeTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ImportAttributeTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ImportAttributeTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/ImportAttributeTag.java Tue Dec 12 04:33:33 2006
@@ -20,7 +20,7 @@
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import java.util.Iterator;
@@ -28,8 +28,8 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.tiles.taglib.util.TagUtils;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.struts.tiles2.ComponentContext;
+import org.apache.struts.tiles2.taglib.util.TagUtils;
/**
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InitDefinitionsTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InitDefinitionsTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InitDefinitionsTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InitDefinitionsTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InitDefinitionsTag.java Tue Dec 12 04:33:33 2006
@@ -20,15 +20,15 @@
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.tiles.DefinitionsFactory;
-import org.apache.struts.tiles.DefinitionsFactoryConfig;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.TilesUtil;
+import org.apache.struts.tiles2.DefinitionsFactory;
+import org.apache.struts.tiles2.DefinitionsFactoryConfig;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.TilesUtil;
/**
* Init definitions factory.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InsertTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InsertTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InsertTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InsertTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InsertTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/InsertTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/InsertTag.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import java.io.IOException;
import java.io.PrintWriter;
@@ -35,18 +35,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.Globals;
-import org.apache.struts.tiles.taglib.util.TagUtils;
-import org.apache.struts.tiles.AttributeDefinition;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.Controller;
-import org.apache.struts.tiles.DefinitionAttribute;
-import org.apache.struts.tiles.DefinitionNameAttribute;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.DirectStringAttribute;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
-import org.apache.struts.tiles.TilesUtil;
+import org.apache.struts.tiles2.AttributeDefinition;
+import org.apache.struts.tiles2.ComponentContext;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.Controller;
+import org.apache.struts.tiles2.DefinitionAttribute;
+import org.apache.struts.tiles2.DefinitionNameAttribute;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.DirectStringAttribute;
+import org.apache.struts.tiles2.FactoryNotFoundException;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
+import org.apache.struts.tiles2.TilesUtil;
+import org.apache.struts.tiles2.taglib.util.TagUtils;
/**
* This is the tag handler for <tiles:insert>, which includes
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTag.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import java.util.ArrayList;
import java.util.List;
@@ -27,8 +27,8 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.struts.tiles.AttributeDefinition;
-import org.apache.struts.tiles.UntypedAttribute;
+import org.apache.struts.tiles2.AttributeDefinition;
+import org.apache.struts.tiles2.UntypedAttribute;
/**
* PutList tag implementation.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTagParent.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTagParent.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTagParent.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutListTagParent.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutListTagParent.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import javax.servlet.jsp.JspException;
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTag.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import java.lang.reflect.InvocationTargetException;
@@ -27,11 +27,11 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.tiles.taglib.util.TagUtils;
-import org.apache.struts.tiles.AttributeDefinition;
-import org.apache.struts.tiles.DefinitionNameAttribute;
-import org.apache.struts.tiles.DirectStringAttribute;
-import org.apache.struts.tiles.PathAttribute;
+import org.apache.struts.tiles2.AttributeDefinition;
+import org.apache.struts.tiles2.DefinitionNameAttribute;
+import org.apache.struts.tiles2.DirectStringAttribute;
+import org.apache.struts.tiles2.PathAttribute;
+import org.apache.struts.tiles2.taglib.util.TagUtils;
/**
* Put an attribute in enclosing attribute container tag.
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTagParent.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTagParent.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTagParent.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/PutTagParent.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/PutTagParent.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib;
+package org.apache.struts.tiles2.taglib;
import javax.servlet.jsp.JspException;