You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2005/07/14 08:33:52 UTC
svn commit: r219000 - in /struts/sandbox/trunk/tiles: ./ src/conf/
src/java/org/apache/tiles/ src/java/org/apache/tiles/definition/
src/java/org/apache/tiles/taglib/ src/java/org/apache/tiles/taglib/util/
src/java/org/apache/tiles/xmlDefinition/
Author: craigmcc
Date: Wed Jul 13 23:33:50 2005
New Revision: 219000
URL: http://svn.apache.org/viewcvs?rev=219000&view=rev
Log:
Finish initial package refactoring pass. "ant clean dist" works, but have not
yet tested this at runtime.
Added:
struts/sandbox/trunk/tiles/src/conf/MANIFEST.MF
Modified:
struts/sandbox/trunk/tiles/build.xml
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/AttributeDefinition.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinition.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinitionsFactory.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionAttribute.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionNameAttribute.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactory.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryConfig.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryException.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DirectStringAttribute.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/FactoryNotFoundException.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/NoSuchDefinitionException.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/PathAttribute.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesException.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UntypedAttribute.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ComponentDefinitionsFactoryWrapper.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/ComponentConstants.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java
struts/sandbox/trunk/tiles/src/java/org/apache/tiles/xmlDefinition/FactorySet.java
Modified: struts/sandbox/trunk/tiles/build.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/build.xml?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/build.xml (original)
+++ struts/sandbox/trunk/tiles/build.xml Wed Jul 13 23:33:50 2005
@@ -34,20 +34,17 @@
<!-- Build Defaults -->
<property name="build.home" value="${basedir}/target"/>
<property name="dist.home" value="${basedir}/dist"/>
+ <property name="lib.home" value="${basedir}/lib"/>
<property name="project.name" value="Tiles Core Library"/>
<property name="project.package" value="org.apache.tiles"/>
<property name="project.version" value="0.2-dev"/>
+ <!-- Dependency Defaults -->
+ <property name="maven.repo" value="http://www.ibiblio.org/maven"/>
+
<!-- Dependency library defaults -->
- <property name="commons-beanutils.jar" value="${beanutils.home}/commons-beanutils.jar"/>
- <property name="commons-digester.jar" value="${digester.home}/commons-digester.jar"/>
- <property name="commons-logging.jar" value="${logging.home}/commons-logging.jar"/>
- <property name="jsp-api.jar" value="${server.home}/common/lib/jsp-api.jar"/>
- <property name="jsf-impl.jar" value="${jsf.home}/lib/jsf-impl.jar"/>
- <property name="jsf-api.jar" value="${jsf.home}/lib/jsf-api.jar"/>
<property name="junit.jar" value="${junit.home}/junit.jar"/>
- <property name="servlet-api.jar" value="${server.home}/common/lib/servlet-api.jar"/>
<!-- Compile Defaults -->
@@ -62,28 +59,27 @@
<property name="test.runner" value="junit.textui.TestRunner"/>
+ <!-- External Dependency Declarations -->
+ <fileset id="external.libs"
+ dir="${lib.home}">
+ <include name="*.jar"/>
+ <exclude name="junit.jar"/>
+ </fileset>
+ <path id="external.path">
+ <fileset refid="external.libs"/>
+ </path>
+
<!-- Compile Classpath -->
- <path id="compile.classpath">
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-digester.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
- <pathelement location="${jsp-api.jar}"/>
- <pathelement location="${servlet-api.jar}"/>
+ <path id="compile.classpath">
+ <path refid="external.path"/>
<pathelement location="${build.home}/classes"/>
</path>
<!-- Test Classpath -->
- <path id="test.classpath">
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-digester.jar}"/>
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsp-api.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${servlet-api.jar}"/>
- <pathelement location="${build.home}/classes"/>
+ <path id="test.classpath">
+ <path refid="external.path"/>
+ <pathelement location="${lib.home}/junit.jar"/>
<pathelement location="${build.home}/test-classes"/>
</path>
@@ -102,15 +98,7 @@
<echo message="---------- ${project.name} ${project.version} -----------"/>
<filter token="name" value="${project.name}"/>
<filter token="package" value="${project.package}"/>
- <filter token="state" value="${systest.state.saving}"/>
<filter token="version" value="${project.version}"/>
- <echo message="commons-beanutils.jar = ${commons-beanutils.jar}"/>
- <echo message="commons-digester.jar = ${commons-digester.jar}"/>
- <echo message="commons-logging.jar = ${commons-logging.jar}"/>
- <echo message="jsf-api.jar = ${jsf-api.jar}"/>
- <echo message="jsf-impl.jar = ${jsf-impl.jar}"/>
- <echo message="jsp-api.jar = ${jsp-api.jar}"/>
- <echo message="servlet-api.jar = ${servlet-api.jar}"/>
</target>
@@ -135,7 +123,7 @@
</copy>
<copy todir="${build.home}/classes/META-INF">
<fileset dir="src/conf"
- includes="tiles-core.tld"/>
+ includes="*.tld"/>
</copy>
</target>
@@ -282,6 +270,47 @@
</batchtest>
</junit>
+
+ </target>
+
+
+ <!-- ===================== Dependency Targets ============================ -->
+
+
+ <target name="download-dependencies"
+ description="Doanload freely available dependencies">
+
+ <mkdir dir="${lib.home}"/>
+
+ <get dest="${lib.home}/commons-beanutils.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/commons-beanutils/jars/commons-beanutils-1.7.0.jar"
+ usetimestamp="true"/>
+
+ <get dest="${lib.home}/commons-digester.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/commons-digester/jars/commons-digester-1.7.jar"
+ usetimestamp="true"/>
+
+ <get dest="${lib.home}/commons-logging.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/commons-logging/jars/commons-logging-1.0.4.jar"
+ usetimestamp="true"/>
+
+ <get dest="${lib.home}/jsp-api.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/jspapi/jars/jsp-api-2.0.jar"
+ usetimestamp="true"/>
+
+ <get dest="${lib.home}/junit.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/junit/jars/junit-3.8.1.jar"
+ usetimestamp="true"/>
+
+ <get dest="${lib.home}/servlet-api.jar"
+ ignoreerrors="true"
+ src="${maven.repo}/servletapi/jars/servletapi-2.4.jar"
+ usetimestamp="true"/>
</target>
Added: struts/sandbox/trunk/tiles/src/conf/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/conf/MANIFEST.MF?rev=219000&view=auto
==============================================================================
--- struts/sandbox/trunk/tiles/src/conf/MANIFEST.MF (added)
+++ struts/sandbox/trunk/tiles/src/conf/MANIFEST.MF Wed Jul 13 23:33:50 2005
@@ -0,0 +1,5 @@
+Extension-Name: @package@
+Specification-Vendor: The Apache Software Foundation
+Specification-Version: 1.0
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Version: @version@
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/AttributeDefinition.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/AttributeDefinition.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/AttributeDefinition.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/AttributeDefinition.java Wed Jul 13 23:33:50 2005
@@ -17,7 +17,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.Serializable;
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.Serializable;
import java.util.Collections;
@@ -28,7 +28,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.jsp.PageContext;
-import org.apache.struts.tiles.taglib.ComponentConstants;
+import org.apache.tiles.taglib.ComponentConstants;
/**
* Component context.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinition.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinition.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinition.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinition.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.Serializable;
import java.util.HashMap;
@@ -24,8 +24,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.xmlDefinition.XmlDefinition;
-import org.apache.struts.util.RequestUtils;
+import org.apache.tiles.xmlDefinition.XmlDefinition;
+import org.apache.tiles.util.RequestUtils;
/**
* Definition of a template / component attributes.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinitionsFactory.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinitionsFactory.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinitionsFactory.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentDefinitionsFactory.java Wed Jul 13 23:33:50 2005
@@ -17,7 +17,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.Serializable;
import java.util.Map;
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.IOException;
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.IOException;
@@ -51,7 +51,7 @@
}
/**
- * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+ * @see org.apache.tiles.Controller#execute(org.apache.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
*/
public void execute(
ComponentContext tileContext,
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionAttribute.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionAttribute.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionAttribute.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionAttribute.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Attribute representing a Component Definition.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionNameAttribute.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionNameAttribute.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionNameAttribute.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionNameAttribute.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Component attribute.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactory.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactory.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactory.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactory.java Wed Jul 13 23:33:50 2005
@@ -17,7 +17,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.Serializable;
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryConfig.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryConfig.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryConfig.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryConfig.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
@@ -39,10 +39,10 @@
/**
* Fully qualified classname of the factory to create.
* If no classname is set, a default factory is created
- * (of class "org.apache.struts.tiles.xmlDefinition.I18nFactorySet").
+ * (of class "org.apache.tiles.xmlDefinition.I18nFactorySet").
*/
protected String factoryClassname =
- "org.apache.struts.tiles.xmlDefinition.I18nFactorySet";
+ "org.apache.tiles.xmlDefinition.I18nFactorySet";
/**
* Specifies whether the parser will validate configuration files.
@@ -220,7 +220,7 @@
map.put(PARSER_DETAILS_PARAMETER_NAME, Integer.toString(getParserDebugLevel()) );
map.put(PARSER_VALIDATE_PARAMETER_NAME, new Boolean(getParserValidate()).toString() );
- if( ! "org.apache.struts.tiles.xmlDefinition.I18nFactorySet".equals(getFactoryClassname()) )
+ if( ! "org.apache.tiles.xmlDefinition.I18nFactorySet".equals(getFactoryClassname()) )
map.put(FACTORY_CLASSNAME_PARAMETER_NAME, getFactoryClassname());
*/
return map;
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryException.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryException.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryException.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsFactoryException.java Wed Jul 13 23:33:50 2005
@@ -17,7 +17,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Exception thrown when an error occurs while the factory tries to
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.lang.reflect.InvocationTargetException;
import java.util.Enumeration;
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.taglib.ComponentConstants;
+import org.apache.tiles.taglib.ComponentConstants;
/**
* Utilities class for definitions factory.
@@ -71,14 +71,14 @@
* Constant name used to store factory in context.
*/
public static final String DEFINITIONS_FACTORY =
- "org.apache.struts.tiles.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.
*/
public static final String ACTION_DEFINITION =
- "org.apache.struts.tiles.ACTION_DEFINITION";
+ "org.apache.tiles.ACTION_DEFINITION";
/**
* Create Definition factory.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DirectStringAttribute.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DirectStringAttribute.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DirectStringAttribute.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DirectStringAttribute.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Component attribute.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/FactoryNotFoundException.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/FactoryNotFoundException.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/FactoryNotFoundException.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/FactoryNotFoundException.java Wed Jul 13 23:33:50 2005
@@ -17,7 +17,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Exception thrown when definitions factory is not found.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/NoSuchDefinitionException.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/NoSuchDefinitionException.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/NoSuchDefinitionException.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/NoSuchDefinitionException.java Wed Jul 13 23:33:50 2005
@@ -17,7 +17,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Exception thrown when a definition is not found.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/PathAttribute.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/PathAttribute.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/PathAttribute.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/PathAttribute.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Component attribute.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesException.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesException.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesException.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesException.java Wed Jul 13 23:33:50 2005
@@ -17,7 +17,7 @@
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.IOException;
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.IOException;
import java.io.Serializable;
@@ -33,8 +33,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.definition.ComponentDefinitionsFactoryWrapper;
-import org.apache.struts.util.RequestUtils;
+import org.apache.tiles.definition.ComponentDefinitionsFactoryWrapper;
+import org.apache.tiles.util.RequestUtils;
/**
* Default implementation of TilesUtil.
@@ -48,7 +48,7 @@
/** Constant name used to store factory in servlet context */
public static final String DEFINITIONS_FACTORY =
- "org.apache.struts.tiles.DEFINITIONS_FACTORY";
+ "org.apache.tiles.DEFINITIONS_FACTORY";
/**
* JSP 2.0 include method to use which supports configurable flushing.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UntypedAttribute.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UntypedAttribute.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UntypedAttribute.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UntypedAttribute.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
/**
* Common implementation of attribute definition.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java Wed Jul 13 23:33:50 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.struts.tiles;
+package org.apache.tiles;
import java.io.IOException;
@@ -71,7 +71,7 @@
}
/**
- * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+ * @see org.apache.tiles.Controller#execute(org.apache.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
*/
public void execute(
ComponentContext tileContext,
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ComponentDefinitionsFactoryWrapper.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ComponentDefinitionsFactoryWrapper.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ComponentDefinitionsFactoryWrapper.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ComponentDefinitionsFactoryWrapper.java Wed Jul 13 23:33:50 2005
@@ -30,7 +30,7 @@
import org.apache.tiles.DefinitionsFactoryConfig;
import org.apache.tiles.DefinitionsFactoryException;
import org.apache.tiles.NoSuchDefinitionException;
-import org.apache.util.RequestUtils;
+import org.apache.tiles.util.RequestUtils;
/**
* Wrapper from new definition factory interface to old interface.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java Wed Jul 13 23:33:50 2005
@@ -32,7 +32,7 @@
import org.apache.tiles.DefinitionsFactoryException;
import org.apache.tiles.FactoryNotFoundException;
import org.apache.tiles.xmlDefinition.I18nFactorySet;
-import org.apache.util.RequestUtils;
+import org.apache.tiles.util.RequestUtils;
/**
* A reloadable factory.
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/ComponentConstants.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/ComponentConstants.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/ComponentConstants.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/ComponentConstants.java Wed Jul 13 23:33:50 2005
@@ -18,18 +18,16 @@
package org.apache.tiles.taglib;
-import org.apache.Globals;
-
/**
* Constants used by Tiles/Components.
*/
public interface ComponentConstants {
/** Name used to store Tile/Component context. */
- public static final String COMPONENT_CONTEXT = "org.apache.tiles.taglib.CompContext";
+ public static final String COMPONENT_CONTEXT = "org.apache.tiles.CompContext";
public static final int COMPONENT_SCOPE = 8;
- public static final String LOCALE_KEY = Globals.LOCALE_KEY;
- public static final String EXCEPTION_KEY = Globals.EXCEPTION_KEY;
+ public static final String LOCALE_KEY = "org.apache.tiles.LOCALE";
+ public static final String EXCEPTION_KEY = "org.apache.tiles.EXCEPTION";
}
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java Wed Jul 13 23:33:50 2005
@@ -31,7 +31,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.Globals;
import org.apache.tiles.taglib.util.TagUtils;
import org.apache.tiles.AttributeDefinition;
import org.apache.tiles.ComponentContext;
@@ -583,7 +582,7 @@
// Save exception to be able to show it later
pageContext.setAttribute(
- Globals.EXCEPTION_KEY,
+ ComponentConstants.EXCEPTION_KEY,
ex,
PageContext.REQUEST_SCOPE);
throw new JspException(ex);
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java Wed Jul 13 23:33:50 2005
@@ -26,7 +26,6 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.Globals;
import org.apache.tiles.taglib.ComponentConstants;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.ComponentDefinition;
@@ -324,7 +323,7 @@
* @param exception The exception to be saved.
*/
public static void saveException(PageContext pageContext, Throwable exception) {
- pageContext.setAttribute(Globals.EXCEPTION_KEY, exception, PageContext.REQUEST_SCOPE);
+ pageContext.setAttribute(ComponentConstants.EXCEPTION_KEY, exception, PageContext.REQUEST_SCOPE);
}
/**
Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/xmlDefinition/FactorySet.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/xmlDefinition/FactorySet.java?rev=219000&r1=218999&r2=219000&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/xmlDefinition/FactorySet.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/xmlDefinition/FactorySet.java Wed Jul 13 23:33:50 2005
@@ -1,4 +1,4 @@
-str/*
+/*
* $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org