svn commit: r1733041 - in /tomcat/trunk/java/org/apache: catalina/connector/Response.java catalina/util/UriUtil.java catalina/valves/rewrite/RewriteValve.java tomcat/util/buf/UriUtil.java

[ma...@apache.org]

Author: markt
Date: Tue Mar  1 11:48:08 2016
New Revision: 1733041

URL: http://svn.apache.org/viewvc?rev=1733041&view=rev
Log:
Move UriUtil to the o.a.tomcat.util.buf package as I want to add some JAR URL utility methods to it. I thought about o.a.tomcat.util.net but that is really all I/O and this class seems a better fit with those in in buf.

Added:
    tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java
      - copied, changed from r1733040, tomcat/trunk/java/org/apache/catalina/util/UriUtil.java
Removed:
    tomcat/trunk/java/org/apache/catalina/util/UriUtil.java
Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Response.java
    tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1733041&r1=1733040&r2=1733041&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue Mar  1 11:48:08 2016
@@ -51,13 +51,13 @@ import org.apache.catalina.Wrapper;
 import org.apache.catalina.security.SecurityUtil;
 import org.apache.catalina.util.RequestUtil;
 import org.apache.catalina.util.SessionConfig;
-import org.apache.catalina.util.UriUtil;
 import org.apache.coyote.ActionCode;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.UEncoder;
 import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
+import org.apache.tomcat.util.buf.UriUtil;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.http.parser.MediaTypeCache;

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1733041&r1=1733040&r2=1733041&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue Mar  1 11:48:08 2016
@@ -45,10 +45,10 @@ import org.apache.catalina.connector.Con
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.util.URLEncoder;
-import org.apache.catalina.util.UriUtil;
 import org.apache.catalina.valves.ValveBase;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.UriUtil;
 import org.apache.tomcat.util.http.RequestUtil;
 
 public class RewriteValve extends ValveBase {

Copied: tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java (from r1733040, tomcat/trunk/java/org/apache/catalina/util/UriUtil.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java?p2=tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java&p1=tomcat/trunk/java/org/apache/catalina/util/UriUtil.java&r1=1733040&r2=1733041&rev=1733041&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/UriUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java Tue Mar  1 11:48:08 2016
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.catalina.util;
+package org.apache.tomcat.util.buf;
 
 /**
  * Utility class for working with URIs and URLs.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org