Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed deprecated legacy rewrite rule

This commit is contained in:
Greg Wilkins 2015-01-23 11:38:11 +01:00
parent 03121edc92
commit 437dbbef01
3 changed files with 2 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/LegacyRule.java
View File

@ -1,100 +0,0 @@
//
// ========================================================================
// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.rewrite.handler;
import java.io.IOException;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.PathMap;
import org.eclipse.jetty.util.URIUtil;
/**
* Rule implementing the legacy API of RewriteHandler
*
*
*/
public class LegacyRule extends Rule
{
private PathMap _rewrite = new PathMap(true);
public LegacyRule()
{
_handling = false;
_terminating = false;
}
/* ------------------------------------------------------------ */
@Override
public String matchAndApply(String target, HttpServletRequest request, HttpServletResponse response) throws IOException
{
Map.Entry<?,?> rewrite =_rewrite.getMatch(target);
if (rewrite!=null && rewrite.getValue()!=null)
{
target=URIUtil.addPaths(rewrite.getValue().toString(),
PathMap.pathInfo(rewrite.getKey().toString(),target));
return target;
}
return null;
}
/* ------------------------------------------------------------ */
/**
* Returns the map of rewriting rules.
* @return A {@link PathMap} of the rewriting rules.
*/
public PathMap getRewrite()
{
return _rewrite;
}
/* ------------------------------------------------------------ */
/**
* Sets the map of rewriting rules.
* @param rewrite A {@link PathMap} of the rewriting rules. Only
* prefix paths should be included.
*/
public void setRewrite(PathMap rewrite)
{
_rewrite=rewrite;
}
/* ------------------------------------------------------------ */
/** Add a path rewriting rule
* @param pattern The path pattern to match. The pattern must start with / and may use
* a trailing /* as a wildcard.
* @param prefix The path prefix which will replace the matching part of the path.
*/
public void addRewriteRule(String pattern, String prefix)
{
if (pattern==null || pattern.length()==0 || !pattern.startsWith("/"))
throw new IllegalArgumentException();
if (_rewrite==null)
_rewrite=new PathMap(true);
_rewrite.put(pattern,prefix);
}
}

14
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java
View File

@ -170,7 +170,6 @@ import org.eclipse.jetty.server.handler.HandlerWrapper;
*/
public class RewriteHandler extends HandlerWrapper
{
private RuleContainer _rules;
/* ------------------------------------------------------------ */
@ -179,19 +178,6 @@ public class RewriteHandler extends HandlerWrapper
_rules = new RuleContainer();
}
/* ------------------------------------------------------------ */
/**
* To enable configuration from jetty.xml on rewriteRequestURI, rewritePathInfo and
* originalPathAttribute
*
* @param legacyRule old style rewrite rule
*/
@Deprecated
public void setLegacyRule(LegacyRule legacyRule)
{
_rules.setLegacyRule(legacyRule);
}
/* ------------------------------------------------------------ */
/**
* Returns the list of rules.

37
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java
View File

@ -47,34 +47,6 @@ public class RuleContainer extends Rule
protected boolean _rewriteRequestURI=true;
protected boolean _rewritePathInfo=true;
protected LegacyRule _legacy;
/* ------------------------------------------------------------ */
@Deprecated
public LegacyRule getLegacyRule()
{
if (_legacy==null)
{
_legacy= new LegacyRule();
addRule(_legacy);
}
return _legacy;
}
/* ------------------------------------------------------------ */
/**
* To enable configuration from jetty.xml on rewriteRequestURI, rewritePathInfo and
* originalPathAttribute
*
* @param legacyRule old style rewrite rule
*/
@Deprecated
public void setLegacyRule(LegacyRule legacyRule)
{
_legacy = legacyRule;
}
/* ------------------------------------------------------------ */
/**
* Returns the list of rules.
@ -92,16 +64,7 @@ public class RuleContainer extends Rule
*/
public void setRules(Rule[] rules)
{
if (_legacy==null)
_rules = rules;
else
{
_rules=null;
addRule(_legacy);
if (rules!=null)
for (Rule rule:rules)
addRule(rule);
}
}
/* ------------------------------------------------------------ */