~james-page/ubuntu/oneiric/jenkins-winstone/827651

« back to all changes in this revision

Viewing changes to src/java/winstone/URIUtil.java

Committer: Bazaar Package Importer
Author(s): James Page
Date: 2011-06-29 12:16:17 UTC
Revision ID: james.westby@ubuntu.com-20110629121617-vd3ha6lp4nqvxkbr

Tags: upstream-0.9.10-jenkins-25+dfsg

Import upstream version 0.9.10-jenkins-25+dfsg

files added:

.classpath

.cvsignore

.gitignore

.hgignore

.project

.settings

.settings/org.eclipse.core.resources.prefs

.settings/org.eclipse.jdt.core.prefs

LICENSE-CDDL.txt

LICENSE-LGPL.txt

Makefile

README.html

TODO.txt

checkstyle.xml

contrib

contrib/JDBCRealm.java

contrib/NioSocketServer.java

contrib/README_jp.html

contrib/sample_filters.zip

deploy.sh

maven.xml

pom.xml

project.properties

project.xml

site.css

src/conf

src/conf/jndi.properties

src/java

src/java/javax

src/java/javax/servlet

src/java/javax/servlet/Filter.java

src/java/javax/servlet/FilterChain.java

src/java/javax/servlet/FilterConfig.java

src/java/javax/servlet/GenericServlet.java

src/java/javax/servlet/RequestDispatcher.java

src/java/javax/servlet/Servlet.java

src/java/javax/servlet/ServletConfig.java

src/java/javax/servlet/ServletContext.java

src/java/javax/servlet/ServletContextAttributeEvent.java

src/java/javax/servlet/ServletContextAttributeListener.java

src/java/javax/servlet/ServletContextEvent.java

src/java/javax/servlet/ServletContextListener.java

src/java/javax/servlet/ServletException.java

src/java/javax/servlet/ServletInputStream.java

src/java/javax/servlet/ServletOutputStream.java

src/java/javax/servlet/ServletRequest.java

src/java/javax/servlet/ServletRequestAttributeEvent.java

src/java/javax/servlet/ServletRequestAttributeListener.java

src/java/javax/servlet/ServletRequestEvent.java

src/java/javax/servlet/ServletRequestListener.java

src/java/javax/servlet/ServletRequestWrapper.java

src/java/javax/servlet/ServletResponse.java

src/java/javax/servlet/ServletResponseWrapper.java

src/java/javax/servlet/SingleThreadModel.java

src/java/javax/servlet/UnavailableException.java

src/java/javax/servlet/http

src/java/javax/servlet/http/Cookie.java

src/java/javax/servlet/http/HttpServlet.java

src/java/javax/servlet/http/HttpServletRequest.java

src/java/javax/servlet/http/HttpServletRequestWrapper.java

src/java/javax/servlet/http/HttpServletResponse.java

src/java/javax/servlet/http/HttpServletResponseWrapper.java

src/java/javax/servlet/http/HttpSession.java

src/java/javax/servlet/http/HttpSessionActivationListener.java

src/java/javax/servlet/http/HttpSessionAttributeListener.java

src/java/javax/servlet/http/HttpSessionBindingEvent.java

src/java/javax/servlet/http/HttpSessionBindingListener.java

src/java/javax/servlet/http/HttpSessionContext.java

src/java/javax/servlet/http/HttpSessionEvent.java

src/java/javax/servlet/http/HttpSessionListener.java

src/java/javax/servlet/http/HttpUtils.java

src/java/winstone

src/java/winstone/AccessLogger.java

src/java/winstone/AuthenticationHandler.java

src/java/winstone/AuthenticationPrincipal.java

src/java/winstone/AuthenticationRealm.java

src/java/winstone/ClientOutputStream.java

src/java/winstone/ClientSocketException.java

src/java/winstone/Cluster.java

src/java/winstone/ErrorServlet.java

src/java/winstone/FilterConfiguration.java

src/java/winstone/HostConfiguration.java

src/java/winstone/HostGroup.java

src/java/winstone/HttpListener.java

src/java/winstone/JNDIManager.java

src/java/winstone/Launcher.java

src/java/winstone/Listener.java

src/java/winstone/LocalStrings.properties

src/java/winstone/Logger.java

src/java/winstone/Mapping.java

src/java/winstone/ObjectPool.java

src/java/winstone/RequestDispatcher.java

src/java/winstone/RequestHandlerThread.java

src/java/winstone/ServletConfiguration.java

src/java/winstone/ShutdownHook.java

src/java/winstone/StaticResourceServlet.java

src/java/winstone/URIUtil.java

src/java/winstone/WebAppConfiguration.java

src/java/winstone/WebXmlParser.java

src/java/winstone/WinstoneException.java

src/java/winstone/WinstoneInputStream.java

src/java/winstone/WinstoneOutputStream.java

src/java/winstone/WinstoneRequest.java

src/java/winstone/WinstoneResourceBundle.java

src/java/winstone/WinstoneResponse.java

src/java/winstone/WinstoneResponseWriter.java

src/java/winstone/WinstoneSession.java

src/java/winstone/accesslog

src/java/winstone/accesslog/LocalStrings.properties

src/java/winstone/accesslog/SimpleAccessLogger.java

src/java/winstone/ajp13

src/java/winstone/ajp13/Ajp13IncomingPacket.java

src/java/winstone/ajp13/Ajp13Listener.java

src/java/winstone/ajp13/Ajp13OutputStream.java

src/java/winstone/ajp13/LocalStrings.properties

src/java/winstone/auth

src/java/winstone/auth/BaseAuthenticationHandler.java

src/java/winstone/auth/BasicAuthenticationHandler.java

src/java/winstone/auth/ClientcertAuthenticationHandler.java

src/java/winstone/auth/DigestAuthenticationHandler.java

src/java/winstone/auth/FormAuthenticationHandler.java

src/java/winstone/auth/LocalStrings.properties

src/java/winstone/auth/RetryRequestParams.java

src/java/winstone/auth/RetryRequestWrapper.java

src/java/winstone/auth/SecurityConstraint.java

src/java/winstone/classLoader

src/java/winstone/classLoader/LocalStrings.properties

src/java/winstone/classLoader/ReloadingClassLoader.java

src/java/winstone/classLoader/WebappClassLoader.java

src/java/winstone/cluster

src/java/winstone/cluster/ClusterSessionSearch.java

src/java/winstone/cluster/LocalStrings.properties

src/java/winstone/cluster/SimpleCluster.java

src/java/winstone/invoker

src/java/winstone/invoker/InvokerServlet.java

src/java/winstone/invoker/LocalStrings.properties

src/java/winstone/jndi

src/java/winstone/jndi/ContainerJNDIManager.java

src/java/winstone/jndi/LocalStrings.properties

src/java/winstone/jndi/WebAppJNDIManager.java

src/java/winstone/jndi/WinstoneBindingEnumeration.java

src/java/winstone/jndi/WinstoneContext.java

src/java/winstone/jndi/WinstoneNameEnumeration.java

src/java/winstone/jndi/WinstoneNameParser.java

src/java/winstone/jndi/java

src/java/winstone/jndi/java/javaURLContextFactory.java

src/java/winstone/jndi/resourceFactories

src/java/winstone/jndi/resourceFactories/LocalStrings.properties

src/java/winstone/jndi/resourceFactories/WinstoneConnection.java

src/java/winstone/jndi/resourceFactories/WinstoneDataSource.java

src/java/winstone/realm

src/java/winstone/realm/ArgumentsRealm.java

src/java/winstone/realm/FileRealm.java

src/java/winstone/realm/LocalStrings.properties

src/java/winstone/ssl

src/java/winstone/ssl/HttpsListener.java

src/java/winstone/ssl/LocalStrings.properties

src/java/winstone/tools

src/java/winstone/tools/LocalStrings.properties

src/java/winstone/tools/WinstoneControl.java

src/test

src/test/winstone

src/test/winstone/URIUtilTest.java

src/test/winstone/testApplication

src/test/winstone/testApplication/filters

src/test/winstone/testApplication/filters/TimingFilter.java

src/test/winstone/testApplication/filters/WriteAfterServletFilter.java

src/test/winstone/testApplication/listeners

src/test/winstone/testApplication/listeners/SessionListener.java

src/test/winstone/testApplication/servlets

src/test/winstone/testApplication/servlets/CountRequestsServlet.java

src/test/winstone/testApplication/servlets/UnavailableServlet.java

src/test/winstone/testCase

src/test/winstone/testCase/Base64Test.java

src/test/winstone/testCase/HttpConnectorTest.java

src/test/winstone/testCase/NamingTest.java

src/test/winstone/testCase/StaticResourceServletTest.java

src/test/winstone/testCase/WinstoneResourceBundleTest.java

src/test/winstone/testCase/load

src/test/winstone/testCase/load/LoadTest.java

src/test/winstone/testCase/load/LoadTestThread.java

src/test/winstone/testCase/load/LocalStrings.properties

src/testwebapp

src/testwebapp/WEB-INF

src/testwebapp/WEB-INF/web.xml

sunCodingConventions.xml

winstone.bat

Show diffs side-by-side

added added

removed removed

src/java/winstone/URIUtil.java

package winstone;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Iterator;

import java.util.List;

/**

* @author Kohsuke Kawaguchi

public class URIUtil {

/**

* Eliminates "." and ".." in the path.

* So that this method can be used for any string that looks like an URI,

* this method preserves the leading and trailing '/'.

static String canonicalPath(String path) {

List r = new ArrayList(Arrays.asList(path.split("/+")));

for (int i=0; i<r.size(); ) {

String cur = (String)r.get(i);

if (cur.length()==0 || cur.equals(".")) {

// empty token occurs for example, "".split("/+") is [""]

r.remove(i);

} else

if (cur.equals("..")) {

// i==0 means this is a broken URI.

r.remove(i);

if (i>0) {

r.remove(i-1);

i--;

}

} else {

i++;

}

StringBuilder buf = new StringBuilder();

if (path.startsWith("/"))

buf.append('/');

boolean first = true;

for (Iterator itr = r.iterator(); itr.hasNext();) {

String token = (String) itr.next();

if (!first) buf.append('/');

else first = false;

buf.append(token);

}

// translation: if (path.endsWith("/") && !buf.endsWith("/"))

if (path.endsWith("/") && (buf.length()==0 || buf.charAt(buf.length()-1)!='/'))

buf.append('/');

return buf.toString();

}

Older »