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 [2/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/...
Copied: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTag.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTag.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/UseAttributeTei.java (from r483436, struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java)
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.java?view=diff&rev=486112&p1=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java&r1=483436&p2=struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.java&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles/taglib/UseAttributeTei.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/UseAttributeTei.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.tagext.TagData;
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/taglib/util/TagUtils.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.taglib.util;
+package org.apache.struts.tiles2.taglib.util;
import java.lang.reflect.InvocationTargetException;
import java.util.Map;
@@ -30,13 +30,13 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.Globals;
-import org.apache.struts.tiles.taglib.ComponentConstants;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-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.DefinitionsFactoryException;
+import org.apache.struts.tiles2.FactoryNotFoundException;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
+import org.apache.struts.tiles2.TilesUtil;
+import org.apache.struts.tiles2.taglib.ComponentConstants;
/**
* Collection of utilities.
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/DefinitionsFactory.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
import java.io.Serializable;
import java.util.HashMap;
@@ -29,9 +29,9 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
/**
* A factory for definitions.
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/FactorySet.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/FactorySet.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/FactorySet.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/FactorySet.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
import java.util.HashMap;
import java.util.Iterator;
@@ -28,11 +28,11 @@
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.DefinitionsFactoryException;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+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.NoSuchDefinitionException;
/**
* Component Definitions factory.
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/I18nFactorySet.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/I18nFactorySet.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/I18nFactorySet.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/I18nFactorySet.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -39,9 +39,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.taglib.ComponentConstants;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.FactoryNotFoundException;
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.FactoryNotFoundException;
+import org.apache.struts.tiles2.taglib.ComponentConstants;
import org.xml.sax.SAXException;
/**
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlAttribute.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlAttribute.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlAttribute.java Tue Dec 12 04:33:33 2006
@@ -19,12 +19,12 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
-import org.apache.struts.tiles.DefinitionNameAttribute;
-import org.apache.struts.tiles.DirectStringAttribute;
-import org.apache.struts.tiles.PathAttribute;
-import org.apache.struts.tiles.UntypedAttribute;
+import org.apache.struts.tiles2.DefinitionNameAttribute;
+import org.apache.struts.tiles2.DirectStringAttribute;
+import org.apache.struts.tiles2.PathAttribute;
+import org.apache.struts.tiles2.UntypedAttribute;
/**
* A property key-value pair. This class is used to read configuration files.
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinition.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinition.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinition.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinition.java Tue Dec 12 04:33:33 2006
@@ -19,14 +19,14 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
/**
*A definition read from an XML definitions file.
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinitionsSet.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinitionsSet.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinitionsSet.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlDefinitionsSet.java Tue Dec 12 04:33:33 2006
@@ -19,13 +19,13 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+import org.apache.struts.tiles2.NoSuchDefinitionException;
/**
* A set of definitions read from XML definitions file.
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlListAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlListAttribute.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlListAttribute.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlListAttribute.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
import java.util.ArrayList;
import java.util.List;
Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlParser.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlParser.java?view=diff&rev=486112&r1=483436&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlParser.java (original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/xmlDefinition/XmlParser.java Tue Dec 12 04:33:33 2006
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts.tiles.xmlDefinition;
+package org.apache.struts.tiles2.xmlDefinition;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
@@ -94,7 +94,7 @@
private void initDigesterForComponentsDefinitionsSyntax( Digester digester )
{
// Common constants
- String PACKAGE_NAME = "org.apache.struts.tiles.xmlDefinition";
+ String PACKAGE_NAME = "org.apache.struts.tiles2.xmlDefinition";
String DEFINITION_TAG = "component-definitions/definition";
String definitionHandlerClass = PACKAGE_NAME + ".XmlDefinition";
@@ -136,7 +136,7 @@
private void initDigesterForTilesDefinitionsSyntax( Digester digester )
{
// Common constants
- String PACKAGE_NAME = "org.apache.struts.tiles.xmlDefinition";
+ String PACKAGE_NAME = "org.apache.struts.tiles2.xmlDefinition";
String DEFINITION_TAG = "tiles-definitions/definition";
String definitionHandlerClass = PACKAGE_NAME + ".XmlDefinition";
@@ -190,14 +190,14 @@
//String ADD_WILDCARD = LIST_TAG + "/addItem";
// non String ADD_WILDCARD = LIST_TAG + "/addx*";
String ADD_WILDCARD = "*/item";
- String menuItemDefaultClass = "org.apache.struts.tiles.beans.SimpleMenuItem";
+ String menuItemDefaultClass = "org.apache.struts.tiles2.beans.SimpleMenuItem";
digester.addObjectCreate( ADD_WILDCARD, menuItemDefaultClass, "classtype");
digester.addSetNext( ADD_WILDCARD, "add", "java.lang.Object");
digester.addSetProperties( ADD_WILDCARD);
// bean elements rules
String BEAN_TAG = "*/bean";
- String beanDefaultClass = "org.apache.struts.tiles.beans.SimpleMenuItem";
+ String beanDefaultClass = "org.apache.struts.tiles2.beans.SimpleMenuItem";
digester.addObjectCreate( BEAN_TAG, beanDefaultClass, "classtype");
digester.addSetNext( BEAN_TAG, "add", "java.lang.Object");
digester.addSetProperties( BEAN_TAG);
@@ -215,7 +215,7 @@
private void initDigesterForInstancesSyntax( Digester digester )
{
// Build a digester to process our configuration resource
- String PACKAGE_NAME = "org.apache.struts.tiles.xmlDefinition";
+ String PACKAGE_NAME = "org.apache.struts.tiles2.xmlDefinition";
String INSTANCE_TAG = "component-instances/instance";
String instanceHandlerClass = PACKAGE_NAME + ".XmlDefinition";
Modified: struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java?view=diff&rev=486112&r1=486111&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java (original)
+++ struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/CustomI18nFactorySet.java Tue Dec 12 04:33:33 2006
@@ -25,7 +25,10 @@
import java.util.Locale;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
-import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
+
+import org.apache.struts.tiles2.DefinitionsFactoryException;
+import org.apache.struts.tiles2.FactoryNotFoundException;
+import org.apache.struts.tiles2.xmlDefinition.I18nFactorySet;
/**
* <p>Test I18nFactorySet.</p>
*
@@ -46,7 +49,7 @@
super(servletContext, properties);
}
- public org.apache.struts.tiles.xmlDefinition.DefinitionsFactory createFactory(
+ public org.apache.struts.tiles2.xmlDefinition.DefinitionsFactory createFactory(
Object key,
ServletRequest request,
ServletContext servletContext)
Modified: struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java?view=diff&rev=486112&r1=486111&r2=486112
==============================================================================
--- struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java (original)
+++ struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles/TestTilesPlugin.java Tue Dec 12 04:33:33 2006
@@ -27,7 +27,10 @@
import org.apache.struts.mock.MockActionServlet;
import org.apache.struts.mock.TestMockBase;
import org.apache.struts.Globals;
-import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
+import org.apache.struts.tiles2.ComponentDefinition;
+import org.apache.struts.tiles2.DefinitionsFactory;
+import org.apache.struts.tiles2.TilesUtil;
+import org.apache.struts.tiles2.xmlDefinition.I18nFactorySet;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.action.PlugIn;
import org.apache.commons.beanutils.BeanUtils;
@@ -107,7 +110,7 @@
// Set tiles plugin
PlugInConfig pluginConfig = new PlugInConfig();
- pluginConfig.setClassName("org.apache.struts.tiles.TilesPlugin");
+ pluginConfig.setClassName("org.apache.struts.tiles2.TilesPlugin");
pluginConfig.addProperty(
"moduleAware",
@@ -232,7 +235,7 @@
Locale locale = null;
ComponentDefinition definition = null;
- org.apache.struts.tiles.xmlDefinition.DefinitionsFactory factory = null;
+ org.apache.struts.tiles2.xmlDefinition.DefinitionsFactory factory = null;
Map properties = new HashMap();
@@ -289,7 +292,7 @@
Locale locale = null;
ComponentDefinition definition = null;
- org.apache.struts.tiles.xmlDefinition.DefinitionsFactory factory = null;
+ org.apache.struts.tiles2.xmlDefinition.DefinitionsFactory factory = null;
Map properties = new HashMap();