Author: markt
Date: Mon Jul 30 21:23:18 2012
New Revision: 1367313
URL: http://svn.apache.org/viewvc?rev=1367313&view=rev
Log:
Refactoring. Move Mapper. Preparation for further mapper related refactoring to
follow.
Added:
tomcat/trunk/java/org/apache/catalina/mapper/
- copied from r1366723,
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/
tomcat/trunk/test/org/apache/catalina/mapper/
- copied from r1366723,
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/
Removed:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1367313&r1=1367312&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Mon Jul 30 21:23:18 2012
@@ -35,8 +35,8 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.catalina.mapper.Mapper;
import org.apache.tomcat.JarScanner;
-import org.apache.tomcat.util.http.mapper.Mapper;
/**
* A <b>Context</b> is a Container that represents a servlet context, and
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1367313&r1=1367312&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Jul 30
21:23:18 2012
@@ -27,13 +27,13 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Service;
import org.apache.catalina.core.AprLifecycleListener;
+import org.apache.catalina.mapper.Mapper;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.coyote.Adapter;
import org.apache.coyote.ProtocolHandler;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.tomcat.util.http.mapper.Mapper;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1367313&r1=1367312&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Jul
30 21:23:18 2012
@@ -28,10 +28,10 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.mapper.Mapper;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.http.mapper.Mapper;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1367313&r1=1367312&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Jul 30
21:23:18 2012
@@ -72,6 +72,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.core.ApplicationPart;
import org.apache.catalina.core.ApplicationSessionCookieConfig;
import org.apache.catalina.core.AsyncContextImpl;
+import org.apache.catalina.mapper.MappingData;
import org.apache.catalina.util.ParameterMap;
import org.apache.catalina.util.StringParser;
import org.apache.coyote.ActionCode;
@@ -92,7 +93,6 @@ import org.apache.tomcat.util.http.fileu
import org.apache.tomcat.util.http.fileupload.FileUploadException;
import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
-import org.apache.tomcat.util.http.mapper.MappingData;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1367313&r1=1367312&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Mon Jul
30 21:23:18 2012
@@ -65,6 +65,7 @@ import org.apache.catalina.Service;
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.deploy.FilterDef;
+import org.apache.catalina.mapper.MappingData;
import org.apache.catalina.util.ResourceSet;
import org.apache.catalina.util.ServerInfo;
import org.apache.naming.resources.DirContextURLStreamHandler;
@@ -73,7 +74,6 @@ import org.apache.tomcat.util.ExceptionU
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.RequestUtil;
-import org.apache.tomcat.util.http.mapper.MappingData;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1367313&r1=1367312&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jul 30
21:23:18 2012
@@ -435,8 +435,8 @@ public class StandardContext extends Con
/**
* The mapper associated with this context.
*/
- private org.apache.tomcat.util.http.mapper.Mapper mapper =
- new org.apache.tomcat.util.http.mapper.Mapper();
+ private org.apache.catalina.mapper.Mapper mapper =
+ new org.apache.catalina.mapper.Mapper();
/**
@@ -2064,7 +2064,7 @@ public class StandardContext extends Con
* Get the mapper associated with the context.
*/
@Override
- public org.apache.tomcat.util.http.mapper.Mapper getMapper() {
+ public org.apache.catalina.mapper.Mapper getMapper() {
return (mapper);
}
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1367313&r1=1366723&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Mon Jul 30
21:23:18 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.http.mapper;
+package org.apache.catalina.mapper;
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
Modified: tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java?rev=1367313&r1=1366723&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java Mon Jul 30
21:23:18 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomcat.util.http.mapper;
+package org.apache.catalina.mapper;
import org.apache.tomcat.util.buf.MessageBytes;
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1367313&r1=1367312&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Mon Jul 30
21:23:18 2012
@@ -54,11 +54,11 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.catalina.mapper.Mapper;
import org.apache.catalina.util.ContextName;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.juli.logging.Log;
import org.apache.tomcat.JarScanner;
-import org.apache.tomcat.util.http.mapper.Mapper;
import org.apache.tomcat.util.res.StringManager;
/**
Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java?rev=1367313&r1=1366723&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java (original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java Mon Jul 30
21:23:18 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.http.mapper;
+package org.apache.catalina.mapper;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Modified:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java?rev=1367313&r1=1366723&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java Mon
Jul 30 21:23:18 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.http.mapper;
+package org.apache.catalina.mapper;
import java.io.IOException;
Modified:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java?rev=1367313&r1=1366723&r2=1367313&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperWelcomeFiles.java
Mon Jul 30 21:23:18 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.http.mapper;
+package org.apache.catalina.mapper;
import java.io.File;
import java.util.HashMap;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
