Copied:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java
Wed Nov 1 18:03:00 2006
@@ -16,7 +16,15 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.util;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.DefinitionsFactoryConfig;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.taglib.ComponentConstants;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
@@ -24,48 +32,49 @@
import java.util.Map;
import java.util.Set;
-import org.apache.tiles.taglib.ComponentConstants;
-
/**
* Utilities class for definitions impl.
* Also define userDebugLevel property (TODO to be moved from this class ?).
+ *
* @deprecated Use [EMAIL PROTECTED]
TilesUtil#createDefinitionsFactory(DefinitionsFactoryConfig)}
*/
public class DefinitionsUtil extends TilesUtil implements ComponentConstants {
- /**
+ /**
* Global user defined debug level.
- * @deprecated This will be removed in a release after Struts 1.2.
+ *
+ * @deprecated This will be removed in a release after Struts 1.2.
*/
public static int userDebugLevel = 0;
- /**
- * User Debug level.
- * @deprecated This will be removed in a release after Struts 1.2.
+ /**
+ * User Debug level.
+ *
+ * @deprecated This will be removed in a release after Struts 1.2.
*/
public static final int NO_DEBUG = 0;
- /**
- * Name of init property carrying debug level.
+ /**
+ * Name of init property carrying debug level.
*/
public static final String DEFINITIONS_CONFIG_USER_DEBUG_LEVEL =
"definitions-debug";
- /**
+ /**
* Name of init property carrying impl class name.
*/
public static final String DEFINITIONS_FACTORY_CLASSNAME =
"definitions-impl-class";
- /**
+ /**
* Constant name used to store impl in context.
*/
public static final String DEFINITIONS_FACTORY =
"org.apache.tiles.DEFINITIONS_FACTORY";
- /**
+ /**
* Constant name used to store definition in jsp context.
- * Used to pass definition from a Struts action to servlet forward.
+ * Used to pass definition from a Struts action to servlet forward.
*/
public static final String ACTION_DEFINITION =
"org.apache.tiles.ACTION_DEFINITION";
@@ -74,9 +83,10 @@
* Create Definition impl.
* If a impl class name is provided, a impl of this class is created.
Otherwise,
* default impl is created.
- * @param classname Class name of the impl to create.
+ *
+ * @param classname Class name of the impl to create.
* @param tilesContext The current Tiles application context.
- * @param properties Map of name/property used to initialize impl
configuration object.
+ * @param properties Map of name/property used to initialize impl
configuration object.
* @return newly created impl.
* @throws DefinitionsFactoryException If an error occur while
initializing impl
* @deprecated Use createDefinitionsFactory(ServletContext servletContext,
ServletConfig servletConfig)
@@ -109,8 +119,9 @@
/**
* Create default Definition impl.
+ *
* @param tilesContext The current Tiles application context.
- * @param properties Map of name/property used to initialize impl
configuration object.
+ * @param properties Map of name/property used to initialize impl
configuration object.
* @return newly created impl of type ConfigurableDefinitionsFactory.
* @throws DefinitionsFactoryException If an error occur while
initializing impl
*/
@@ -126,7 +137,7 @@
* Create Definition impl.
* Create configuration object from servlet web.xml file, then create
* ConfigurableDefinitionsFactory and initialized it with object.
- * <p>
+ * <p/>
* Convenience method. Calls createDefinitionsFactory(ServletContext
servletContext, DefinitionsFactoryConfig factoryConfig)
*
* @param tilesContext The current Tiles application context.
@@ -143,9 +154,9 @@
}
-
/**
* Get Definition stored in jsp context by an action.
+ *
* @return ComponentDefinition or null if not found.
*/
public static ComponentDefinition getActionDefinition(TilesRequestContext
tilesContext) {
@@ -176,12 +187,14 @@
/**
* Populate Definition Factory Config from web.xml properties.
+ *
* @param factoryConfig Definition Factory Config to populate.
- * @param tilesContext The current Tiles application context.
- * @exception IllegalAccessException if the caller does not have
- * access to the property accessor method
- * @exception java.lang.reflect.InvocationTargetException if the property
accessor method
- * throws an exception
+ * @param tilesContext The current Tiles application context.
+ * @throws IllegalAccessException if the caller does not have
+ * access to the property accessor method
+ * @throws java.lang.reflect.InvocationTargetException
+ * if the property accessor method
+ * throws an exception
* @see org.apache.commons.beanutils.BeanUtils
* @since tiles 20020708
*/
@@ -198,8 +211,8 @@
* Create FactoryConfig and initialize it from web.xml.
*
* @param tilesContext the current Tiles application context.
- * @exception DefinitionsFactoryException if this <code>PlugIn</code>
cannot
- * be successfully initialized
+ * @throws DefinitionsFactoryException if this <code>PlugIn</code> cannot
+ * be successfully initialized
*/
protected static DefinitionsFactoryConfig
readFactoryConfig(TilesApplicationContext tilesContext)
throws DefinitionsFactoryException {
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/RequestUtils.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/RequestUtils.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/RequestUtils.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/RequestUtils.java
Wed Nov 1 18:03:00 2006
@@ -18,14 +18,13 @@
package org.apache.tiles.util;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.servlet.http.HttpServletRequest;
+import java.net.MalformedURLException;
+import java.net.URL;
+
/**
* <p>General purpose utility methods related to processing a servlet request
* with Tiles.</p>
@@ -34,7 +33,6 @@
*/
public class RequestUtils {
-
// ------------------------------------------------------- Static Variables
@@ -43,7 +41,6 @@
*/
protected static Log log = LogFactory.getLog(RequestUtils.class);
-
// --------------------------------------------------------- Public Methods
@@ -53,14 +50,12 @@
* request.</p>
*
* @param request The servlet request we are processing
- * @param path The context-relative path (must start with '/')
- *
- * @return absolute URL based on context-relative path
- *
- * @exception MalformedURLException if we cannot create an absolute URL
+ * @param path The context-relative path (must start with '/')
+ * @return absolute URL based on context-relative path
+ * @throws MalformedURLException if we cannot create an absolute URL
*/
public static URL absoluteURL(HttpServletRequest request, String path)
- throws MalformedURLException {
+ throws MalformedURLException {
return (new URL(serverURL(request), request.getContextPath() + path));
@@ -73,25 +68,23 @@
*
* @param className Fully qualified class name to be loaded
* @return Class object
- *
- * @exception ClassNotFoundException if the class cannot be found
+ * @throws ClassNotFoundException if the class cannot be found
*/
public static Class applicationClass(String className) throws
ClassNotFoundException {
return applicationClass(className, null);
}
- /**
+ /**
* <p>Return the <code>Class</code> object for the specified fully
qualified
* class name, from this web application's class loader.</p>
*
- * @param className Fully qualified class name to be loaded
+ * @param className Fully qualified class name to be loaded
* @param classLoader The desired classloader to use
* @return Class object
- *
- * @exception ClassNotFoundException if the class cannot be found
+ * @throws ClassNotFoundException if the class cannot be found
*/
- public static Class applicationClass(String className, ClassLoader
classLoader)
- throws ClassNotFoundException {
+ public static Class applicationClass(String className, ClassLoader
classLoader)
+ throws ClassNotFoundException {
if (classLoader == null) {
// Look up the class loader to be used
@@ -99,7 +92,7 @@
if (classLoader == null) {
classLoader = RequestUtils.class.getClassLoader();
}
- }
+ }
// Attempt to load the specified class
return (classLoader.loadClass(className));
@@ -114,44 +107,42 @@
* constructor.</p>
*
* @param className Fully qualified class name to use
- *
* @return new instance of class
- * @exception ClassNotFoundException if the class cannot be found
- * @exception IllegalAccessException if the class or its constructor
- * is not accessible
- * @exception InstantiationException if this class represents an
- * abstract class, an interface, an array class, a primitive type,
- * or void
- * @exception InstantiationException if this class has no
- * zero-arguments constructor
+ * @throws ClassNotFoundException if the class cannot be found
+ * @throws IllegalAccessException if the class or its constructor
+ * is not accessible
+ * @throws InstantiationException if this class represents an
+ * abstract class, an interface, an array
class, a primitive type,
+ * or void
+ * @throws InstantiationException if this class has no
+ * zero-arguments constructor
*/
public static Object applicationInstance(String className)
- throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
return applicationInstance(className, null);
}
- /**
+ /**
* <p>Return a new instance of the specified fully qualified class name,
* after loading the class from this web application's class loader.
* The specified class <strong>MUST</strong> have a public zero-arguments
* constructor.</p>
*
- * @param className Fully qualified class name to use
+ * @param className Fully qualified class name to use
* @param classLoader The desired classloader to use
- *
* @return new instance of class
- * @exception ClassNotFoundException if the class cannot be found
- * @exception IllegalAccessException if the class or its constructor
- * is not accessible
- * @exception InstantiationException if this class represents an
- * abstract class, an interface, an array class, a primitive type,
- * or void
- * @exception InstantiationException if this class has no
- * zero-arguments constructor
+ * @throws ClassNotFoundException if the class cannot be found
+ * @throws IllegalAccessException if the class or its constructor
+ * is not accessible
+ * @throws InstantiationException if this class represents an
+ * abstract class, an interface, an array
class, a primitive type,
+ * or void
+ * @throws InstantiationException if this class has no
+ * zero-arguments constructor
*/
public static Object applicationInstance(String className, ClassLoader
classLoader)
- throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
return (applicationClass(className, classLoader).newInstance());
@@ -191,9 +182,8 @@
* to <code>HttpServletRequest.getRequestURL</code> in Servlet 2.3.</p>
*
* @param request The servlet request we are processing
-
* @return URL representing the current request
- * @exception MalformedURLException if a URL cannot be created
+ * @throws MalformedURLException if a URL cannot be created
*/
public static URL requestURL(HttpServletRequest request) throws
MalformedURLException {
@@ -209,10 +199,9 @@
* appending the server-relative path (starting with '/') to this.</p>
*
* @param request The servlet request we are processing
- *
* @return URL representing the scheme, server, and port number of
- * the current request
- * @exception MalformedURLException if a URL cannot be created
+ * the current request
+ * @throws MalformedURLException if a URL cannot be created
*/
public static URL serverURL(HttpServletRequest request) throws
MalformedURLException {
@@ -228,15 +217,14 @@
* appending the server-relative path (starting with '/') to this.</p>
*
* @param request The servlet request we are processing
-
* @return URL representing the scheme, server, and port number of
- * the current request
+ * the current request
* @since Struts 1.2.0
*/
public static StringBuffer
requestToServerUriStringBuffer(HttpServletRequest request) {
- StringBuffer serverUri =
createServerUriStringBuffer(request.getScheme(),request.getServerName(),
- request.getServerPort(),request.getRequestURI());
+ StringBuffer serverUri =
createServerUriStringBuffer(request.getScheme(), request.getServerName(),
+ request.getServerPort(), request.getRequestURI());
return serverUri;
}
@@ -247,14 +235,13 @@
* appending the server-relative path (starting with '/') to this.</p>
*
* @param request The servlet request we are processing
- *
* @return URL representing the scheme, server, and port number of
- * the current request
+ * the current request
* @since Struts 1.2.0
*/
public static StringBuffer requestToServerStringBuffer(HttpServletRequest
request) {
- return
createServerStringBuffer(request.getScheme(),request.getServerName(),request.getServerPort());
+ return createServerStringBuffer(request.getScheme(),
request.getServerName(), request.getServerPort());
}
@@ -265,12 +252,11 @@
*
* @param scheme The scheme name to use
* @param server The server name to use
- * @param port The port value to use
- *
+ * @param port The port value to use
* @return StringBuffer in the form scheme: server: port
* @since Struts 1.2.0
*/
- public static StringBuffer createServerStringBuffer(String scheme,String
server,int port) {
+ public static StringBuffer createServerStringBuffer(String scheme, String
server, int port) {
StringBuffer url = new StringBuffer();
if (port < 0) {
@@ -294,15 +280,14 @@
*
* @param scheme The scheme name to use
* @param server The server name to use
- * @param port The port value to use
- * @param uri The uri value to use
- *
+ * @param port The port value to use
+ * @param uri The uri value to use
* @return StringBuffer in the form scheme: server: port
* @since Struts 1.2.0
*/
- public static StringBuffer createServerUriStringBuffer(String
scheme,String server,int port,String uri) {
+ public static StringBuffer createServerUriStringBuffer(String scheme,
String server, int port, String uri) {
- StringBuffer serverUri = createServerStringBuffer(scheme,server,port);
+ StringBuffer serverUri = createServerStringBuffer(scheme, server,
port);
serverUri.append(uri);
return serverUri;
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtil.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtil.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtil.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtil.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtil.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtil.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtil.java
Wed Nov 1 18:03:00 2006
@@ -16,11 +16,14 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.util;
-import java.io.IOException;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.definition.*;
import javax.servlet.jsp.PageContext;
+import java.io.IOException;
/**
@@ -36,11 +39,14 @@
*/
public class TilesUtil {
- /** The implementation of tilesUtilImpl */
+ /**
+ * The implementation of tilesUtilImpl
+ */
protected static TilesUtilImpl tilesUtilImpl;
/**
* Get the real implementation.
+ *
* @return The underlying implementation object.
*/
static public TilesUtilImpl getTilesUtil() {
@@ -51,6 +57,7 @@
* Set the real implementation.
* This method should be called only once.
* Successive calls have no effect.
+ *
* @param tilesUtil The implementaion.
*/
static public void setTilesUtil(TilesUtilImpl tilesUtil) {
@@ -64,13 +71,16 @@
/**
* Getter to know if the underlying implementation is already set to
another
* value than the default value.
+ *
* @return <code>true</code> if [EMAIL PROTECTED] #setTilesUtil} has
already been called.
*/
static boolean isTilesUtilImplSet() {
return implAlreadySet;
}
- /** Flag to know if internal implementation has been set by the setter
method */
+ /**
+ * Flag to know if internal implementation has been set by the setter
method
+ */
private static boolean implAlreadySet = false;
public static TilesApplicationContext getApplicationContext() {
@@ -83,9 +93,10 @@
/**
* Do a forward using request dispatcher.
- *
+ * <p/>
* This method is used by the Tiles package anytime a forward is required.
- * @param uri Uri or Definition name to forward.
+ *
+ * @param uri Uri or Definition name to forward.
* @param tilesContext Current Tiles application context.
*/
public static void doForward(
@@ -98,10 +109,11 @@
/**
* Do an include using request dispatcher.
- *
+ * <p/>
* This method is used by the Tiles package when an include is required.
* The Tiles package can use indifferently any form of this method.
- * @param uri Uri or Definition name to forward.
+ *
+ * @param uri Uri or Definition name to forward.
* @param tilesContext Current Tiles application context.
*/
public static void doInclude(
@@ -114,10 +126,11 @@
/**
* Do an include using PageContext.include().
- *
+ * <p/>
* This method is used by the Tiles package when an include is required.
* The Tiles package can use indifferently any form of this method.
- * @param uri Uri or Definition name to forward.
+ *
+ * @param uri Uri or Definition name to forward.
* @param pageContext Current page context.
*/
public static void doInclude(String uri, PageContext pageContext)
@@ -127,11 +140,12 @@
/**
* Do an include using PageContext.include().
- *
+ * <p/>
* This method is used by the Tiles package when an include is required.
* The Tiles package can use indifferently any form of this method.
- * @param uri Uri or Definition name to forward.
- * @param flush If the writer should be flushed before the include
+ *
+ * @param uri Uri or Definition name to forward.
+ * @param flush If the writer should be flushed before the include
* @param pageContext Current page context.
*/
public static void doInclude(String uri, PageContext pageContext, boolean
flush)
@@ -141,6 +155,7 @@
/**
* Get definition impl from appropriate servlet context.
+ *
* @return Definitions impl or <code>null</code> if not found.
*/
public static DefinitionsFactory getDefinitionsFactory() {
@@ -152,12 +167,13 @@
* Create a ConfigurableDefinitionsFactory and initialize it with the
configuration
* object. This later can contain the impl classname to use.
* Factory is made accessible from tags.
- * <p>
+ * <p/>
* Fallback of several impl creation methods.
*
* @param factoryConfig Configuration object passed to impl.
* @return newly created impl of type ConfigurableDefinitionsFactory.
- * @throws DefinitionsFactoryException If an error occur while
initializing impl
+ * @throws org.apache.tiles.definition.DefinitionsFactoryException
+ * If an error occur while initializing impl
*/
public static DefinitionsFactory createDefinitionsFactory(
DefinitionsFactoryConfig factoryConfig)
@@ -169,11 +185,14 @@
* Get a definition by its name.
* First, retrieve definition impl and then get requested definition.
* Throw appropriate exception if definition or definition impl is not
found.
+ *
* @param definitionName Name of requested definition.
- * @param tilesContext Current Tiles application context.
+ * @param tilesContext Current Tiles application context.
* @throws FactoryNotFoundException Can't find definition impl.
- * @throws DefinitionsFactoryException General error in impl while getting
definition.
- * @throws NoSuchDefinitionException No definition found for specified name
+ * @throws org.apache.tiles.definition.DefinitionsFactoryException
+ * General error in impl while getting
definition.
+ * @throws org.apache.tiles.definition.NoSuchDefinitionException
+ * No definition found for specified name
*/
public static ComponentDefinition getDefinition(
String definitionName,
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtil.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtilImpl.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtilImpl.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtilImpl.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtilImpl.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtilImpl.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtilImpl.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtilImpl.java
Wed Nov 1 18:03:00 2006
@@ -16,26 +16,26 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.context.BasicTilesContextFactory;
+import org.apache.tiles.definition.*;
+
+import javax.servlet.jsp.PageContext;
import java.io.IOException;
import java.io.Serializable;
-
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import javax.servlet.jsp.PageContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.util.RequestUtils;
-import org.apache.tiles.context.BasicTilesContextFactory;
-
/**
* Default implementation of TilesUtil.
* This class contains default implementation of utilities. This implementation
@@ -43,16 +43,22 @@
*/
public class TilesUtilImpl implements Serializable {
- /** Commons Logging instance.*/
+ /**
+ * Commons Logging instance.
+ */
protected static final Log log = LogFactory.getLog(TilesUtil.class);
- /** Constant name used to store impl in servlet context */
+ /**
+ * Constant name used to store impl in servlet context
+ */
public static final String DEFINITIONS_FACTORY =
"org.apache.tiles.DEFINITIONS_FACTORY";
- /** Constant used to store ComponentDefinitions graph. */
+ /**
+ * Constant used to store ComponentDefinitions graph.
+ */
public static final String DEFINITIONS_OBJECT =
- "org.apache.tiles.ComponentDefinitions";
+ "org.apache.tiles.definition.ComponentDefinitions";
/**
* JSP 2.0 include method to use which supports configurable flushing.
@@ -71,7 +77,7 @@
include = PageContext.class.getMethod("include", args);
} catch (NoSuchMethodException e) {
log.debug("Could not find JSP 2.0 include method. Using old one
that doesn't support " +
- "configurable flushing.", e);
+ "configurable flushing.", e);
}
}
@@ -81,19 +87,20 @@
this.applicationContext = applicationContext;
}
- public TilesApplicationContext getApplicationContext() {
- return applicationContext;
- }
+ public TilesApplicationContext getApplicationContext() {
+ return applicationContext;
+ }
public TilesRequestContext createRequestContext(Object request, Object
response) {
return new
BasicTilesContextFactory().createRequestContext(applicationContext, request,
response);
}
- /**
+ /**
* Do a forward using request dispatcher.
- *
+ * <p/>
* This method is used by the Tiles package anytime a forward is required.
- * @param uri Uri or Definition name to forward.
+ *
+ * @param uri Uri or Definition name to forward.
* @param tilesContext Current Tiles application context.
*/
public void doForward(
@@ -106,10 +113,11 @@
/**
* Do an include using request dispatcher.
- *
+ * <p/>
* This method is used by the Tiles package when an include is required.
* The Tiles package can use indifferently any form of this method.
- * @param uri Uri or Definition name to forward.
+ *
+ * @param uri Uri or Definition name to forward.
* @param tilesContext Current Tiles application context.
*/
public void doInclude(
@@ -122,12 +130,13 @@
/**
* Do an include using PageContext.include().
- *
+ * <p/>
* This method is used by the Tiles package when an include is required.
* The Tiles package can use indifferently any form of this method.
- * @param uri Uri or Definition name to forward.
+ *
+ * @param uri Uri or Definition name to forward.
* @param pageContext Current page context.
- * @param flush If the writer should be flushed before the include
+ * @param flush If the writer should be flushed before the include
*/
public void doInclude(String uri, PageContext pageContext, boolean flush)
throws IOException, Exception {
@@ -148,6 +157,7 @@
/**
* Get definition impl from appropriate servlet context.
+ *
* @return Definitions impl or <code>null</code> if not found.
*/
public DefinitionsFactory getDefinitionsFactory() {
@@ -160,9 +170,9 @@
* Create an instance of the impl with the class specified in the config
* object. Then, initialize this impl and finally store the impl in
* appropriate context by calling
- * [EMAIL PROTECTED]
#makeDefinitionsFactoryAccessible(DefinitionsFactory)}.
+ * [EMAIL PROTECTED]
#makeDefinitionsFactoryAccessible(org.apache.tiles.definition.DefinitionsFactory)}.
* Factory creation is done by [EMAIL PROTECTED]
#createDefinitionFactoryInstance(String)}.
- * <p>
+ * <p/>
*
* @param factoryConfig Configuration object passed to impl.
* @return newly created impl of type specified in the config object.
@@ -206,7 +216,7 @@
public ComponentDefinition getDefinition(String definitionName,
TilesRequestContext tilesContext)
- throws FactoryNotFoundException, DefinitionsFactoryException {
+ throws FactoryNotFoundException, DefinitionsFactoryException {
try {
DefinitionsFactory factory = getDefinitionsFactory();
@@ -219,6 +229,7 @@
/**
* Create Definition impl of specified classname.
* Factory class must extend the [EMAIL PROTECTED] DefinitionsFactory}
class.
+ *
* @param classname Class name of the impl to create.
* @return newly created impl.
* @throws DefinitionsFactoryException If an error occur while
initializing impl
@@ -257,6 +268,7 @@
/**
* Make definition impl accessible to Tags.
* Factory is stored in servlet context.
+ *
* @param factory Factory to be made accessible.
*/
protected void makeDefinitionsFactoryAccessible(
@@ -264,7 +276,6 @@
applicationContext.getApplicationScope().put(DEFINITIONS_FACTORY,
factory);
}
-
/**
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtilImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtilImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/package.html
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/package.html?view=auto&rev=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/package.html
(added)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/package.html
Wed Nov 1 18:03:00 2006
@@ -0,0 +1,10 @@
+<html>
+<head>
+ <title>tiles.util package</title>
+</head>
+<body>
+Static utility classes.
+These have been deprecated and will be refactored or removed before the
release of Tiles2
+and replaced by the TilesContainer architecture.
+</body>
+</html>
\ No newline at end of file
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java
(from r469623,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockComponentDefinitions.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockComponentDefinitions.java&r1=469623&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockComponentDefinitions.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java
Wed Nov 1 18:03:00 2006
@@ -17,10 +17,12 @@
*/
-package org.apache.tiles.mock;
+package org.apache.tiles.definition;
import java.util.Locale;
-import org.apache.tiles.ComponentDefinitions;
+import org.apache.tiles.definition.ComponentDefinitions;
+import org.apache.tiles.definition.NoSuchDefinitionException;
+import org.apache.tiles.definition.ComponentDefinition;
/**
*
@@ -52,7 +54,7 @@
* @return the ComponentDefinition matching the given name or null if none
* is found.
*/
- public org.apache.tiles.ComponentDefinition getDefinition(String name) {
+ public ComponentDefinition getDefinition(String name) {
return null;
}
@@ -74,7 +76,7 @@
* @return the ComponentDefinition matching the given name or null if none
* is found.
*/
- public org.apache.tiles.ComponentDefinition getDefinition(String name,
java.util.Locale locale) {
+ public ComponentDefinition getDefinition(String name, java.util.Locale
locale) {
return null;
}
@@ -90,13 +92,13 @@
/**
* Resolves configuration inheritance properties.
*/
- public void resolveInheritances() throws
org.apache.tiles.NoSuchDefinitionException {
+ public void resolveInheritances() throws NoSuchDefinitionException {
}
/**
* Resolves configuration inheritance properties.
*/
- public void resolveInheritances(Locale locale) throws
org.apache.tiles.NoSuchDefinitionException {
+ public void resolveInheritances(Locale locale) throws
NoSuchDefinitionException {
}
/**
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockDefinitionsReader.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockDefinitionsReader.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockDefinitionsReader.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
Wed Nov 1 18:03:00 2006
@@ -16,9 +16,10 @@
* limitations under the License.
*/
-package org.apache.tiles.mock;
+package org.apache.tiles.definition;
-import org.apache.tiles.DefinitionsReader;
+import org.apache.tiles.definition.DefinitionsReader;
+import org.apache.tiles.definition.DefinitionsFactoryException;
import java.util.Collections;
@@ -47,17 +48,17 @@
}
/**
- * Reads <code>[EMAIL PROTECTED]
org.apache.tiles.ComponentDefinition}</code> objects from a source.
+ * Reads <code>[EMAIL PROTECTED]
org.apache.tiles.definition.ComponentDefinition}</code> objects from a source.
*
* Implementations should publish what type of source object is expected.
*
* @param source The source from which definitions will be read.
* @return a Map of <code>ComponentDefinition</code> objects read from
* the source.
- * @throws org.apache.tiles.DefinitionsFactoryException if the source is
invalid or
+ * @throws org.apache.tiles.definition.DefinitionsFactoryException if the
source is invalid or
* an error occurs when reading definitions.
*/
- public java.util.Map read(Object source) throws
org.apache.tiles.DefinitionsFactoryException {
+ public java.util.Map read(Object source) throws
DefinitionsFactoryException {
return Collections.EMPTY_MAP;
}
@@ -67,10 +68,10 @@
* This method must be called before the [EMAIL PROTECTED] #read} method
is called.
*
* @param params A map of properties used to set up the reader.
- * @throws org.apache.tiles.DefinitionsFactoryException if required
properties are not
+ * @throws org.apache.tiles.definition.DefinitionsFactoryException if
required properties are not
* passed in or the initialization fails.
*/
- public void init(java.util.Map params) throws
org.apache.tiles.DefinitionsFactoryException {
+ public void init(java.util.Map params) throws DefinitionsFactoryException {
}
}
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
(from r469623,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java&r1=469623&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
Wed Nov 1 18:03:00 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.tiles.mock;
+package org.apache.tiles.definition;
import java.io.IOException;
import java.net.MalformedURLException;
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
Wed Nov 1 18:03:00 2006
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.tiles.mock;
+package org.apache.tiles.definition;
-import org.apache.tiles.ComponentDefinitions;
-import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.definition.ComponentDefinitions;
+import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.TilesRequestContext;
import org.apache.tiles.definition.UrlDefinitionsFactory;
@@ -35,7 +35,7 @@
* Exposes the <code>addDefinitions</code> method of
* <code>UrlDefinitionsFactory</code>
*
- * @see
org.apache.tiles.definition.UrlDefinitionsFactory#addDefinitions(org.apache.tiles.ComponentDefinitions,
+ * @see
org.apache.tiles.definition.UrlDefinitionsFactory#addDefinitions(org.apache.tiles.definition.ComponentDefinitions,
* org.apache.tiles.TilesRequestContext)
*/
public void addDefinitions(ComponentDefinitions definitions,
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
(from r469623,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinition.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinition.java&r1=469623&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinition.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
Wed Nov 1 18:03:00 2006
@@ -16,11 +16,12 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.definition;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.tiles.definition.ComponentDefinition;
/**
* Tests the ComponentDefinition class.
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
(from r469623,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinitions.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinitions.java&r1=469623&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinitions.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
Wed Nov 1 18:03:00 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.definition;
import java.util.HashMap;
import java.util.Locale;
@@ -25,6 +25,10 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.tiles.definition.ComponentDefinitionsImpl;
+import org.apache.tiles.definition.ComponentDefinitions;
+import org.apache.tiles.definition.NoSuchDefinitionException;
+import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.ComponentAttribute;
/**
* Tests the ComponentDefinitionsImpl class.
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestReloadableDefinitionsFactory.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestReloadableDefinitionsFactory.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestReloadableDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
Wed Nov 1 18:03:00 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.definition;
import java.io.*;
import java.net.URI;
@@ -28,6 +28,9 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.tiles.definition.UrlDefinitionsFactory;
+import org.apache.tiles.definition.ComponentDefinitions;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.ReloadableDefinitionsFactory;
/**
* Tests the reloadable definitions impl.
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
Wed Nov 1 18:03:00 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.definition;
import java.net.URL;
import java.util.HashMap;
@@ -28,9 +28,13 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.tiles.definition.UrlDefinitionsFactory;
-import org.apache.tiles.mock.MockPublicUrlDefinitionsFactory;
-import org.apache.tiles.mock.MockDefinitionsReader;
-import org.apache.tiles.mock.MockOnlyLocaleTilesContext;
+import org.apache.tiles.definition.ComponentDefinitions;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.MockPublicUrlDefinitionsFactory;
+import org.apache.tiles.definition.MockDefinitionsReader;
+import org.apache.tiles.definition.MockOnlyLocaleTilesContext;
+import org.apache.tiles.TilesRequestContext;
/**
* Tests the UrlDefinitionsFactory component.
@@ -187,7 +191,7 @@
public void testReaderParam() throws Exception {
Map params = new HashMap();
params.put(DefinitionsFactory.READER_IMPL_PROPERTY,
- "org.apache.tiles.mock.MockDefinitionsReader");
+ "org.apache.tiles.definition.MockDefinitionsReader");
int instanceCount = MockDefinitionsReader.getInstanceCount();
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
(from r469623,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestDigesterDefinitionsReader.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestDigesterDefinitionsReader.java&r1=469623&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestDigesterDefinitionsReader.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
Wed Nov 1 18:03:00 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.definition.digester;
import java.io.InputStream;
import java.net.URL;
@@ -25,12 +25,13 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.tiles.digester.DigesterDefinitionsReader;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.DefinitionsReader;
+import org.apache.tiles.definition.ComponentDefinition;
/**
- * Tests the <code>org.apache.tiles.digester.DigesterDefinitionsReader</code>
class.
+ * Tests the
<code>org.apache.tiles.definition.digester.DigesterDefinitionsReader</code>
class.
*
* @version $Rev$ $Date$
*/
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java
Wed Nov 1 18:03:00 2006
@@ -18,8 +18,8 @@
package org.apache.tiles.preparer;
import junit.framework.TestCase;
-import org.apache.tiles.ViewPreparerSupport;
-import org.apache.tiles.ViewPreparer;
+import org.apache.tiles.preparer.ViewPreparerSupport;
+import org.apache.tiles.preparer.ViewPreparer;
public class BasicPreparerFactoryTest extends TestCase {
Copied:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/TestTilesServlet.java
(from r470071,
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/TestTilesServlet.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java&r1=470071&p2=struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/TestTilesServlet.java&r2=470185
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/TestTilesServlet.java
Wed Nov 1 18:03:00 2006
@@ -17,7 +17,7 @@
*/
-package org.apache.tiles;
+package org.apache.tiles.servlet;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -25,9 +25,10 @@
import junit.textui.TestRunner;
import servletunit.ServletConfigSimulator;
-import org.apache.tiles.mock.MockComponentDefinitions;
-import org.apache.tiles.mock.MockDefinitionsReader;
+import org.apache.tiles.definition.MockComponentDefinitions;
+import org.apache.tiles.definition.MockDefinitionsReader;
import org.apache.tiles.servlet.TilesServlet;
+import org.apache.tiles.definition.DefinitionsFactory;
import javax.servlet.ServletException;
@@ -92,7 +93,7 @@
"org/apache/tiles/config/tiles-defs.xml");
servletConfig.setInitParameter(
DefinitionsFactory.READER_IMPL_PROPERTY,
- "org.apache.tiles.mock.MockDefinitionsReader");
+ "org.apache.tiles.definition.MockDefinitionsReader");
TilesServlet servlet = new TilesServlet();
servlet.init(servletConfig);
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/TestTilesServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/TestTilesServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
