ti...

apetrelli Fri, 02 Mar 2007 06:07:31 -0800

Author: apetrelli
Date: Fri Mar  2 06:07:05 2007
New Revision: 513770

URL: http://svn.apache.org/viewvc?view=rev&rev=513770
Log:
TILES-95
Refactored "tiles-jsp" source code.


Added:
    tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/
    tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/
      - copied from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/jsp/
    tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTagParent.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTagParent.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/
      - copied from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/definition/
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/doc-files/
      - copied from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/doc-files/
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/package.html
      - copied unchanged from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/package.html
    
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld
      - copied, changed from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-core.tld
Removed:
    tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/definition/
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/doc-files/
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/package.html
    
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-core.tld
Modified:
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java

Modified: 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java?view=diff&rev=513770&r1=513769&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
 Fri Mar  2 06:07:05 2007
@@ -42,7 +42,7 @@
     public static final String[] DEFAULT_FACTORY_CLASS_NAMES = {
             "org.apache.tiles.context.servlet.ServletTilesContextFactory",
             "org.apache.tiles.context.portlet.PortletTilesContextFactory",
-            "org.apache.tiles.context.jsp.JspTilesContextFactory" };
+            "org.apache.tiles.jsp.context.JspTilesContextFactory" };
     
     private static Log LOG = 
LogFactory.getLog(ChainedTilesContextFactory.class);
 

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java?view=diff&rev=513770&r1=513762&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
 Fri Mar  2 06:07:05 2007
@@ -20,13 +20,13 @@
  *
  */
 
-package org.apache.tiles.context.jsp;
+package org.apache.tiles.jsp.context;
 
 import org.apache.tiles.TilesApplicationContext;
 import org.apache.tiles.context.TilesContextFactory;
 import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.jsp.JspTilesRequestContext;
 import org.apache.tiles.context.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.jsp.context.JspTilesRequestContext;
 
 import javax.servlet.ServletContext;
 import javax.servlet.jsp.PageContext;

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?view=diff&rev=513770&r1=513762&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
 Fri Mar  2 06:07:05 2007
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-package org.apache.tiles.context.jsp;
+package org.apache.tiles.jsp.context;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java?view=diff&rev=513770&r1=513762&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
 Fri Mar  2 06:07:05 2007
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-package org.apache.tiles.context.jsp;
+package org.apache.tiles.jsp.context;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java?view=diff&rev=513770&r1=513762&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java
 Fri Mar  2 06:07:05 2007
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-package org.apache.tiles.context.jsp;
+package org.apache.tiles.jsp.context;
 
 import javax.servlet.http.HttpServletResponseWrapper;
 import javax.servlet.http.HttpServletResponse;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
 Fri Mar  2 06:07:05 2007
@@ -20,10 +20,10 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentConstants;
-import org.apache.tiles.taglib.ContainerTagSupport;
+import org.apache.tiles.jsp.taglib.ContainerTagSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTagParent.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTagParent.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTagParent.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTagParent.java
 Fri Mar  2 06:07:05 2007
@@ -20,7 +20,7 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import javax.servlet.jsp.JspException;
 

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
 Fri Mar  2 06:07:05 2007
@@ -20,7 +20,7 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentAttribute;
 
@@ -79,7 +79,7 @@
      * Places the value of the nested tag within the
      * [EMAIL PROTECTED] org.apache.tiles.ComponentContext}.It is the 
responsibility
      * of the descendent to check security.  Tags extending
-     * the [EMAIL PROTECTED] org.apache.tiles.taglib.ContainerTagSupport} will 
automatically provide
+     * the [EMAIL PROTECTED] org.apache.tiles.jsp.taglib.ContainerTagSupport} 
will automatically provide
      * the appropriate security.
      *
      * @param nestedTag the put tag desciendent.

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
 Fri Mar  2 06:07:05 2007
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentAttribute;
 import org.apache.tiles.ComponentConstants;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
 Fri Mar  2 06:07:05 2007
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
 Fri Mar  2 06:07:05 2007
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentAttribute;
 import org.apache.tiles.TilesException;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
 Fri Mar  2 06:07:05 2007
@@ -19,10 +19,10 @@
  * under the License.
  *
  */
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.taglib.AttributeTagSupport;
+import org.apache.tiles.jsp.taglib.AttributeTagSupport;
 
 import javax.servlet.jsp.JspException;
 import java.util.Iterator;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
 Fri Mar  2 06:07:05 2007
@@ -20,7 +20,7 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentAttribute;
 import org.apache.tiles.ComponentContext;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
 Fri Mar  2 06:07:05 2007
@@ -20,9 +20,9 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
-import org.apache.tiles.taglib.RenderTagSupport;
+import org.apache.tiles.jsp.taglib.RenderTagSupport;
 import org.apache.tiles.TilesException;
 
 import javax.servlet.jsp.JspException;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
 Fri Mar  2 06:07:05 2007
@@ -20,11 +20,11 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
-import org.apache.tiles.context.jsp.JspUtil;
-import org.apache.tiles.taglib.RenderTagSupport;
-import org.apache.tiles.taglib.PutAttributeTagParent;
+import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
+import org.apache.tiles.jsp.taglib.RenderTagSupport;
 
 import javax.servlet.jsp.JspException;
 

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
 Fri Mar  2 06:07:05 2007
@@ -20,11 +20,11 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentConstants;
-import org.apache.tiles.taglib.ContainerTagSupport;
-import org.apache.tiles.taglib.PutAttributeTagParent;
+import org.apache.tiles.jsp.taglib.ContainerTagSupport;
+import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTagParent.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTagParent.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTagParent.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTagParent.java
 Fri Mar  2 06:07:05 2007
@@ -21,9 +21,9 @@
  */
 
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
-import org.apache.tiles.taglib.PutAttributeTag;
+import org.apache.tiles.jsp.taglib.PutAttributeTag;
 
 import javax.servlet.jsp.JspException;
 

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
 Fri Mar  2 06:07:05 2007
@@ -20,7 +20,7 @@
  *
  */
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.tiles.ComponentAttribute;
 
@@ -79,7 +79,7 @@
      * Places the value of the nested tag within the
      * [EMAIL PROTECTED] org.apache.tiles.ComponentContext}.It is the 
responsibility
      * of the descendent to check security.  Tags extending
-     * the [EMAIL PROTECTED] org.apache.tiles.taglib.ContainerTagSupport} will 
automatically provide
+     * the [EMAIL PROTECTED] org.apache.tiles.jsp.taglib.ContainerTagSupport} 
will automatically provide
      * the appropriate security.
      *
      * @param nestedTag the put tag desciendent.

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
 Fri Mar  2 06:07:05 2007
@@ -19,14 +19,14 @@
  * under the License.
  *
  */
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tiles.ComponentAttribute;
 import org.apache.tiles.TilesException;
-import org.apache.tiles.taglib.PutAttributeTag;
-import org.apache.tiles.taglib.PutAttributeTagParent;
+import org.apache.tiles.jsp.taglib.PutAttributeTag;
+import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TryCatchFinally;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
 (from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
 Fri Mar  2 06:07:05 2007
@@ -21,9 +21,9 @@
  */
 
 
-package org.apache.tiles.taglib;
+package org.apache.tiles.jsp.taglib;
 
-import org.apache.tiles.taglib.AttributeTagSupport;
+import org.apache.tiles.jsp.taglib.AttributeTagSupport;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagData;

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?view=diff&rev=513770&r1=513762&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
 Fri Mar  2 06:07:05 2007
@@ -19,13 +19,13 @@
  * under the License.
  *
  */
-package org.apache.tiles.taglib.definition;
+package org.apache.tiles.jsp.taglib.definition;
 
-import org.apache.tiles.taglib.PutAttributeTagParent;
-import org.apache.tiles.taglib.PutAttributeTag;
 import org.apache.tiles.ComponentAttribute;
 import org.apache.tiles.TilesContainer;
 import org.apache.tiles.TilesException;
+import org.apache.tiles.jsp.taglib.PutAttributeTag;
+import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
 import org.apache.tiles.mgmt.MutableTilesContainer;
 import org.apache.tiles.mgmt.TileDefinition;
 import org.apache.tiles.access.TilesAccess;

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java?view=diff&rev=513770&r1=513762&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
 Fri Mar  2 06:07:05 2007
@@ -19,7 +19,7 @@
  * under the License.
  *
  */
-package org.apache.tiles.taglib.definition;
+package org.apache.tiles.jsp.taglib.definition;
 
 import org.apache.tiles.TilesException;
 import org.apache.tiles.access.TilesAccess;

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java?view=diff&rev=513770&r1=513762&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
 Fri Mar  2 06:07:05 2007
@@ -21,7 +21,7 @@
  */
 
 
-package org.apache.tiles.taglib.definition;
+package org.apache.tiles.jsp.taglib.definition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -29,9 +29,9 @@
 import org.apache.tiles.TilesException;
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.factory.TilesContainerFactory;
+import org.apache.tiles.jsp.taglib.PutAttributeTag;
+import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
 import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.taglib.PutAttributeTagParent;
-import org.apache.tiles.taglib.PutAttributeTag;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;

Copied: 
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld 
(from r513762, 
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-core.tld)
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld?view=diff&rev=513770&p1=tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-core.tld&r1=513762&p2=tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld&r2=513770
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-core.tld 
(original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld 
Fri Mar  2 06:07:05 2007
@@ -36,7 +36,7 @@
    </description>
    <tag>
       <name>insertTemplate</name>
-      <tag-class>org.apache.tiles.taglib.InsertTemplateTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.InsertTemplateTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -126,7 +126,7 @@
    </tag>
    <tag>
       <name>insertDefinition</name>
-      <tag-class>org.apache.tiles.taglib.InsertDefinitionTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.InsertDefinitionTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -215,7 +215,7 @@
    </tag>
    <tag>
       <name>insertAttribute</name>
-      <tag-class>org.apache.tiles.taglib.InsertAttributeTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.InsertAttributeTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -306,7 +306,7 @@
    </tag>
    <tag>
       <name>definition</name>
-      <tag-class>org.apache.tiles.taglib.definition.DefinitionTag</tag-class>
+      
<tag-class>org.apache.tiles.jsp.taglib.definition.DefinitionTag</tag-class>
       <body-content>JSP</body-content>
       <description>
          <![CDATA[
@@ -377,7 +377,7 @@
    </tag>
    <tag>
       <name>putAttribute</name>
-      <tag-class>org.apache.tiles.taglib.PutAttributeTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.PutAttributeTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -475,7 +475,7 @@
    </tag>
    <tag>
       <name>putListAttribute</name>
-      <tag-class>org.apache.tiles.taglib.PutListAttributeTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.PutListAttributeTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -505,7 +505,7 @@
            is not used in the Add Tag (and it's only valid within
            the PutList
         -->
-      <tag-class>org.apache.tiles.taglib.AddAttributeTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.AddAttributeTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -561,7 +561,7 @@
    </tag>
    <tag>
       <name>addListAttribute</name>
-      <tag-class>org.apache.tiles.taglib.AddListAttributeTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.AddListAttributeTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -575,7 +575,7 @@
    </tag>
    <tag>
       <name>getAsString</name>
-      <tag-class>org.apache.tiles.taglib.GetAsStringTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.GetAsStringTag</tag-class>
       <body-content>empty</body-content>
       <description>
       <![CDATA[
@@ -630,8 +630,8 @@
    </tag>
    <tag>
       <name>useAttribute</name>
-      <tag-class>org.apache.tiles.taglib.UseAttributeTag</tag-class>
-      <tei-class>org.apache.tiles.taglib.UseAttributeTag$Tei</tei-class>
+      <tag-class>org.apache.tiles.jsp.taglib.UseAttributeTag</tag-class>
+      <tei-class>org.apache.tiles.jsp.taglib.UseAttributeTag$Tei</tei-class>
       <body-content>empty</body-content>
       <description>
       <![CDATA[
@@ -700,7 +700,7 @@
    </tag>
    <tag>
       <name>importAttribute</name>
-      <tag-class>org.apache.tiles.taglib.ImportAttributeTag</tag-class>
+      <tag-class>org.apache.tiles.jsp.taglib.ImportAttributeTag</tag-class>
       <body-content>empty</body-content>
       <description>
       <![CDATA[
@@ -761,7 +761,7 @@
    <tag>
       <!-- <name>initComponentDefinitions</name> -->
        <name>initContainer</name>
-      
<tag-class>org.apache.tiles.taglib.definition.InitContainerTag</tag-class>
+      
<tag-class>org.apache.tiles.jsp.taglib.definition.InitContainerTag</tag-class>
       <body-content>JSP</body-content>
       <description>
       <![CDATA[
@@ -789,7 +789,7 @@
 
     <tag>
         <name>destroyContainer</name>
-        
<tag-class>org.apache.tiles.taglib.definition.DestroyContainerTag</tag-class>
+        
<tag-class>org.apache.tiles.jsp.taglib.definition.DestroyContainerTag</tag-class>
         <body-content>empty</body-content>
         <description>
             <![CDATA[

svn commit: r513770 - in /tiles/framework/trunk: tiles-core/src/main/java/org/apache/tiles/context/ tiles-jsp/src/main/java/org/apache/tiles/context/ tiles-jsp/src/main/java/org/apache/tiles/jsp/ tiles-jsp/src/main/java/org/apache/tiles/jsp/context/ ti...

Reply via email to