You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by wo...@apache.org on 2014/07/20 04:07:44 UTC
svn commit: r1611996 - in /portals/applications/webcontent/trunk:
portlets/src/test/java/org/apache/portals/applications/webcontent2/proxy/
reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/
reverse-proxy/src/main/java/org/a...
Author: woonsan
Date: Sun Jul 20 02:07:43 2014
New Revision: 1611996
URL: http://svn.apache.org/r1611996
Log:
APA-63: package renaming
Removed:
portals/applications/webcontent/trunk/portlets/src/test/java/org/apache/portals/applications/webcontent2/proxy/TestHttpClientAuth.java
portals/applications/webcontent/trunk/portlets/src/test/java/org/apache/portals/applications/webcontent2/proxy/TestHttpClientThroughProxy.java
portals/applications/webcontent/trunk/portlets/src/test/java/org/apache/portals/applications/webcontent2/proxy/TestProxyPathMappings.java
portals/applications/webcontent/trunk/portlets/src/test/java/org/apache/portals/applications/webcontent2/proxy/TestReverseProxyLinkRewritingParserAaptor.java
portals/applications/webcontent/trunk/portlets/src/test/java/org/apache/portals/applications/webcontent2/proxy/TestURICleaner.java
Modified:
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMapping.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMappingRegistry.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/RequestContext.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyException.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyService.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/URICleaner.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddCookiesToResponseCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeaderToHttpRequestCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeadersToResponseCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/CleanupCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ExecuteHttpClientCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleNotModifiedCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleRedirectionCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpClientCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpRequestCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitializationCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveContentRewriterCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveLocalPathCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveProxyMappingCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveRemoteURICommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/SerializeHttpEntityContentCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyCommand.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyMapping.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultProxyMappingRegistry.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyService.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleaner.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/GzippedSource.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpEntitySource.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpServletResponseSink.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyContext.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpClient.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyProcessingChain.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ServletRequestContext.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/SimpleProxyMapping.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/DefaultReverseProxyServlet.java
portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/SimpleReverseProxyServlet.java
portals/applications/webcontent/trunk/reverse-proxy/src/test/resources/web.xml
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMapping.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMapping.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMapping.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMapping.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2;
+package org.apache.portals.applications.webcontent2.proxy;
import java.util.Map;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMappingRegistry.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMappingRegistry.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMappingRegistry.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ProxyMappingRegistry.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2;
+package org.apache.portals.applications.webcontent2.proxy;
import java.util.Collection;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/RequestContext.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/RequestContext.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/RequestContext.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/RequestContext.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2;
+package org.apache.portals.applications.webcontent2.proxy;
import java.io.IOException;
import java.io.InputStream;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyException.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyException.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyException.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyException.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2;
+package org.apache.portals.applications.webcontent2.proxy;
/**
* The <CODE>ReverseProxyException</CODE> class defines a general exception
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyService.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyService.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyService.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyService.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2;
+package org.apache.portals.applications.webcontent2.proxy;
import java.io.IOException;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/URICleaner.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/URICleaner.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/URICleaner.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/URICleaner.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2;
+package org.apache.portals.applications.webcontent2.proxy;
/**
* URICleaner
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddCookiesToResponseCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddCookiesToResponseCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddCookiesToResponseCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddCookiesToResponseCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import java.net.URI;
@@ -25,11 +25,11 @@ import javax.servlet.http.Cookie;
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.HttpClient;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMapping;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyHttpClient;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyHttpClient;
public class AddCookiesToResponseCommand extends AbstractProxyCommand
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeaderToHttpRequestCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeaderToHttpRequestCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeaderToHttpRequestCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeaderToHttpRequestCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import java.util.Enumeration;
@@ -22,9 +22,9 @@ import java.util.Enumeration;
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.protocol.HTTP;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeadersToResponseCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeadersToResponseCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeadersToResponseCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/AddHeadersToResponseCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
@@ -25,9 +25,9 @@ import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.protocol.HTTP;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
public class AddHeadersToResponseCommand extends AbstractProxyCommand
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/CleanupCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/CleanupCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/CleanupCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/CleanupCommand.java Sun Jul 20 02:07:43 2014
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ExecuteHttpClientCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ExecuteHttpClientCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ExecuteHttpClientCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ExecuteHttpClientCommand.java Sun Jul 20 02:07:43 2014
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleNotModifiedCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleNotModifiedCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleNotModifiedCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleNotModifiedCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
@@ -22,9 +22,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.http.HttpResponse;
import org.apache.http.protocol.HTTP;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleRedirectionCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleRedirectionCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleRedirectionCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/HandleRedirectionCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import java.net.URI;
@@ -23,10 +23,10 @@ import javax.servlet.http.HttpServletRes
import org.apache.http.Header;
import org.apache.http.HttpResponse;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMapping;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpClientCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpClientCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpClientCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpClientCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
@@ -22,10 +22,10 @@ import org.apache.http.client.params.Cli
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.routing.HttpRoutePlanner;
import org.apache.http.params.HttpParams;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyHttpClient;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyHttpClient;
public class InitHttpClientCommand extends AbstractProxyCommand
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpRequestCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpRequestCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpRequestCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitHttpRequestCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
@@ -32,9 +32,9 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.methods.HttpTrace;
import org.apache.http.entity.InputStreamEntity;
import org.apache.http.protocol.HTTP;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
public class InitHttpRequestCommand extends AbstractProxyCommand
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitializationCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitializationCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitializationCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/InitializationCommand.java Sun Jul 20 02:07:43 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveContentRewriterCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveContentRewriterCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveContentRewriterCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveContentRewriterCommand.java Sun Jul 20 02:07:43 2014
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMapping;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.apache.portals.applications.webcontent2.rewriter2.ContentRewriter;
public class ResolveContentRewriterCommand extends AbstractProxyCommand
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveLocalPathCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveLocalPathCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveLocalPathCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveLocalPathCommand.java Sun Jul 20 02:07:43 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveProxyMappingCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveProxyMappingCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveProxyMappingCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveProxyMappingCommand.java Sun Jul 20 02:07:43 2014
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMapping;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMappingRegistry;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMappingRegistry;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
public class ResolveProxyMappingCommand extends AbstractProxyCommand
{
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveRemoteURICommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveRemoteURICommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveRemoteURICommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/ResolveRemoteURICommand.java Sun Jul 20 02:07:43 2014
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.URICleaner;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.URICleaner;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
public class ResolveRemoteURICommand extends AbstractProxyCommand
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/SerializeHttpEntityContentCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/SerializeHttpEntityContentCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/SerializeHttpEntityContentCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/command/SerializeHttpEntityContentCommand.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.command;
+package org.apache.portals.applications.webcontent2.proxy.command;
import java.io.IOException;
import java.io.InputStream;
@@ -30,11 +30,11 @@ import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.GzippedSource;
-import org.apache.portals.applications.webcontent2.proxy2.impl.HttpEntitySource;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.GzippedSource;
+import org.apache.portals.applications.webcontent2.proxy.impl.HttpEntitySource;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyContext;
import org.apache.portals.applications.webcontent2.rewriter2.ContentRewriter;
import org.apache.portals.applications.webcontent2.rewriter2.ContentRewritingContext;
import org.apache.portals.applications.webcontent2.rewriter2.Sink;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyCommand.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyCommand.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyCommand.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyCommand.java Sun Jul 20 02:07:43 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.io.IOException;
import org.apache.commons.chain.Command;
import org.apache.commons.chain.Context;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
public abstract class AbstractProxyCommand implements Command
{
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyMapping.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyMapping.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyMapping.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractProxyMapping.java Sun Jul 20 02:07:43 2014
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMapping;
public abstract class AbstractProxyMapping implements ProxyMapping
{
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultProxyMappingRegistry.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultProxyMappingRegistry.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultProxyMappingRegistry.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultProxyMappingRegistry.java Sun Jul 20 02:07:43 2014
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMapping;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMappingRegistry;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMappingRegistry;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyService.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyService.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyService.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyService.java Sun Jul 20 02:07:43 2014
@@ -1,4 +1,4 @@
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.io.IOException;
import java.util.List;
@@ -6,8 +6,8 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyService;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleaner.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleaner.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleaner.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleaner.java Sun Jul 20 02:07:43 2014
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import org.apache.commons.lang.StringUtils;
-import org.apache.portals.applications.webcontent2.proxy2.URICleaner;
+import org.apache.portals.applications.webcontent2.proxy.URICleaner;
public class DefaultURICleaner implements URICleaner
{
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/GzippedSource.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/GzippedSource.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/GzippedSource.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/GzippedSource.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.io.IOException;
import java.io.InputStream;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpEntitySource.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpEntitySource.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpEntitySource.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpEntitySource.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.io.IOException;
import java.io.InputStream;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpServletResponseSink.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpServletResponseSink.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpServletResponseSink.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/HttpServletResponseSink.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.io.IOException;
import java.io.OutputStream;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyContext.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyContext.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyContext.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyContext.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.util.LinkedList;
import java.util.List;
@@ -24,9 +24,9 @@ import org.apache.commons.chain.impl.Con
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMapping;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMappingRegistry;
-import org.apache.portals.applications.webcontent2.proxy2.RequestContext;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMappingRegistry;
+import org.apache.portals.applications.webcontent2.proxy.RequestContext;
import org.apache.portals.applications.webcontent2.rewriter2.ContentRewriter;
public class ProxyContext extends ContextBase
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpClient.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpClient.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpClient.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpClient.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.util.ArrayList;
import java.util.List;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyProcessingChain.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyProcessingChain.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyProcessingChain.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyProcessingChain.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.io.IOException;
import java.util.Collection;
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.chain.Command;
import org.apache.commons.chain.Context;
import org.apache.commons.chain.impl.ChainBase;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
public class ProxyProcessingChain extends ChainBase
{
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ServletRequestContext.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ServletRequestContext.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ServletRequestContext.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ServletRequestContext.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -24,7 +24,7 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.portals.applications.webcontent2.proxy2.RequestContext;
+import org.apache.portals.applications.webcontent2.proxy.RequestContext;
import org.apache.portals.applications.webcontent2.rewriter2.Sink;
public class ServletRequestContext implements RequestContext
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/SimpleProxyMapping.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/SimpleProxyMapping.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/SimpleProxyMapping.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/SimpleProxyMapping.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
import org.apache.commons.lang.StringUtils;
import org.apache.portals.applications.webcontent2.rewriter2.ContentRewriter;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/DefaultReverseProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/DefaultReverseProxyServlet.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/DefaultReverseProxyServlet.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/DefaultReverseProxyServlet.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.servlet;
+package org.apache.portals.applications.webcontent2.proxy.servlet;
import java.io.IOException;
import java.util.Arrays;
@@ -33,8 +33,8 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpTrace;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyException;
-import org.apache.portals.applications.webcontent2.proxy2.ReverseProxyService;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/SimpleReverseProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/SimpleReverseProxyServlet.java?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/SimpleReverseProxyServlet.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/servlet/SimpleReverseProxyServlet.java Sun Jul 20 02:07:43 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.portals.applications.webcontent2.proxy2.servlet;
+package org.apache.portals.applications.webcontent2.proxy.servlet;
import java.util.List;
@@ -30,28 +30,28 @@ import org.apache.http.conn.ssl.SSLSocke
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
-import org.apache.portals.applications.webcontent2.proxy2.ProxyMappingRegistry;
-import org.apache.portals.applications.webcontent2.proxy2.command.AddCookiesToResponseCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.AddHeaderToHttpRequestCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.AddHeadersToResponseCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.CleanupCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.ExecuteHttpClientCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.HandleNotModifiedCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.HandleRedirectionCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.InitHttpClientCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.InitHttpRequestCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.InitializationCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.ResolveContentRewriterCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.ResolveLocalPathCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.ResolveProxyMappingCommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.ResolveRemoteURICommand;
-import org.apache.portals.applications.webcontent2.proxy2.command.SerializeHttpEntityContentCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.AbstractProxyCommand;
-import org.apache.portals.applications.webcontent2.proxy2.impl.DefaultProxyMappingRegistry;
-import org.apache.portals.applications.webcontent2.proxy2.impl.DefaultReverseProxyService;
-import org.apache.portals.applications.webcontent2.proxy2.impl.DefaultURICleaner;
-import org.apache.portals.applications.webcontent2.proxy2.impl.ProxyProcessingChain;
-import org.apache.portals.applications.webcontent2.proxy2.impl.SimpleProxyMapping;
+import org.apache.portals.applications.webcontent2.proxy.ProxyMappingRegistry;
+import org.apache.portals.applications.webcontent2.proxy.command.AddCookiesToResponseCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.AddHeaderToHttpRequestCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.AddHeadersToResponseCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.CleanupCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.ExecuteHttpClientCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.HandleNotModifiedCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.HandleRedirectionCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.InitHttpClientCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.InitHttpRequestCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.InitializationCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.ResolveContentRewriterCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.ResolveLocalPathCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.ResolveProxyMappingCommand;
+import org.apache.portals.applications.webcontent2.proxy.command.ResolveRemoteURICommand;
+import org.apache.portals.applications.webcontent2.proxy.command.SerializeHttpEntityContentCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.AbstractProxyCommand;
+import org.apache.portals.applications.webcontent2.proxy.impl.DefaultProxyMappingRegistry;
+import org.apache.portals.applications.webcontent2.proxy.impl.DefaultReverseProxyService;
+import org.apache.portals.applications.webcontent2.proxy.impl.DefaultURICleaner;
+import org.apache.portals.applications.webcontent2.proxy.impl.ProxyProcessingChain;
+import org.apache.portals.applications.webcontent2.proxy.impl.SimpleProxyMapping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: portals/applications/webcontent/trunk/reverse-proxy/src/test/resources/web.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/test/resources/web.xml?rev=1611996&r1=1611995&r2=1611996&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/test/resources/web.xml (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/test/resources/web.xml Sun Jul 20 02:07:43 2014
@@ -24,7 +24,7 @@
<!-- Reverse Proxy Servlet -->
<servlet>
<servlet-name>ReverseProxyServlet</servlet-name>
- <servlet-class>org.apache.portals.applications.webcontent2.proxy2.servlet.SimpleReverseProxyServlet</servlet-class>
+ <servlet-class>org.apache.portals.applications.webcontent2.proxy.servlet.SimpleReverseProxyServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>