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/02 03:57:02 UTC

svn commit: r1607228 - in /portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2: proxy/ proxy/impl/ util/

Author: woonsan
Date: Wed Jul  2 01:57:01 2014
New Revision: 1607228

URL: http://svn.apache.org/r1607228
Log:
APA-58: renaming packages

Modified:
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyConstants.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyException.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyNotFoundException.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapper.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapperProvider.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyService.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRequestContextProvider.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContext.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContextAware.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentials.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentialsProvider.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/impl/AbstractReverseProxyTextLinesParserAdaptor.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperImpl.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperProviderImpl.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyServlet.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAaptor.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAdaptor.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRequestContextProvider.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRewritingContext.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultSSOSiteCredentials.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleanerImpl.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpRoutePlanner.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/RewritableHttpReverseProxyServiceImpl.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/CharArraySegment.java
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/WebResourceUtils.java

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyConstants.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyConstants.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyConstants.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyConstants.java Wed Jul  2 01:57:01 2014
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 public interface HttpReverseProxyConstants
 {
     
     String HTTP_HEADER_LOCATION = "Location";
     
-    String PATH_MAPPER = "org.apache.portals.applications.webcontent.proxy.reverseProxyPathMapper";
+    String PATH_MAPPER = "org.apache.portals.applications.webcontent2.proxy.reverseProxyPathMapper";
     
-    String SSO_SITE_CREDENTIALS_PROVIDER = "org.apache.portals.applications.webcontent.proxy.reverseProxySSOSiteCredentialsProvider";
+    String SSO_SITE_CREDENTIALS_PROVIDER = "org.apache.portals.applications.webcontent2.proxy.reverseProxySSOSiteCredentialsProvider";
     
 }

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyException.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyException.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyException.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyException.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 /**
  * The <CODE>HttpReverseProxyException</CODE> class defines a general exception

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyNotFoundException.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyNotFoundException.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyNotFoundException.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyNotFoundException.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 /**
  * The <CODE>HttpReverseProxyNotFoundException</CODE> class defines a not-found-exception

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapper.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapper.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapper.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapper.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 import java.util.Map;
 import java.util.Set;

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapperProvider.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapperProvider.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapperProvider.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyPathMapperProvider.java Wed Jul  2 01:57:01 2014
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
-import org.apache.portals.applications.webcontent.rewriter.RewriterController;
-import org.apache.portals.applications.webcontent.rewriter.rules.Ruleset;
+import org.apache.portals.applications.webcontent2.rewriter.RewriterController;
+import org.apache.portals.applications.webcontent2.rewriter.rules.Ruleset;
 
 /**
  * proxy path mapper provider interface for http reverse proxy service.

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyService.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyService.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyService.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/HttpReverseProxyService.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+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/ReverseProxyRequestContextProvider.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRequestContextProvider.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRequestContextProvider.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRequestContextProvider.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContext.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContext.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContext.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContext.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 /**
  * ReverseProxyRewritingContext interface providing some reverse proxy mapping related information.

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContextAware.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContextAware.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContextAware.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/ReverseProxyRewritingContextAware.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 /**
  * ReverseProxyRewritingContextAware interface.

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentials.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentials.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentials.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentials.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 import java.io.Serializable;
 

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentialsProvider.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentialsProvider.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentialsProvider.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/SSOSiteCredentialsProvider.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 import java.util.List;
 

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=1607228&r1=1607227&r2=1607228&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 Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy;
+package org.apache.portals.applications.webcontent2.proxy;
 
 /**
  * URICleaner

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractReverseProxyTextLinesParserAdaptor.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractReverseProxyTextLinesParserAdaptor.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractReverseProxyTextLinesParserAdaptor.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/AbstractReverseProxyTextLinesParserAdaptor.java Wed Jul  2 01:57:01 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapperProvider;
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRewritingContext;
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRewritingContextAware;
-import org.apache.portals.applications.webcontent.rewriter.AbstractTextLinesParserAdaptor;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapper;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapperProvider;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRewritingContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRewritingContextAware;
+import org.apache.portals.applications.webcontent2.rewriter.AbstractTextLinesParserAdaptor;
 
 
 /**

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperImpl.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperImpl.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperImpl.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperImpl.java Wed Jul  2 01:57:01 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapper;
 
 /**
  * Default implementation of <CODE>HttpProxyPathMapper</CODE> interface.

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperProviderImpl.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperProviderImpl.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyPathMapperProviderImpl.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,10 +26,10 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.commons.lang.StringUtils;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapperProvider;
-import org.apache.portals.applications.webcontent.rewriter.RewriterController;
-import org.apache.portals.applications.webcontent.rewriter.rules.Ruleset;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapper;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapperProvider;
+import org.apache.portals.applications.webcontent2.rewriter.RewriterController;
+import org.apache.portals.applications.webcontent2.rewriter.rules.Ruleset;
 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/DefaultHttpReverseProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyServlet.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyServlet.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultHttpReverseProxyServlet.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -63,16 +63,16 @@ import org.apache.http.conn.scheme.Schem
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyException;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyNotFoundException;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyService;
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRequestContextProvider;
-import org.apache.portals.applications.webcontent.proxy.URICleaner;
-import org.apache.portals.applications.webcontent.rewriter.MappingRewriterController;
-import org.apache.portals.applications.webcontent.rewriter.RewriterController;
-import org.apache.portals.applications.webcontent.rewriter.rules.Ruleset;
-import org.apache.portals.applications.webcontent.util.WebResourceUtils;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyNotFoundException;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapper;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyService;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRequestContextProvider;
+import org.apache.portals.applications.webcontent2.proxy.URICleaner;
+import org.apache.portals.applications.webcontent2.rewriter.MappingRewriterController;
+import org.apache.portals.applications.webcontent2.rewriter.RewriterController;
+import org.apache.portals.applications.webcontent2.rewriter.rules.Ruleset;
+import org.apache.portals.applications.webcontent2.util.WebResourceUtils;
 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/DefaultReverseProxyLinkRewritingParserAaptor.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAaptor.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAaptor.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAaptor.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.util.Set;
 

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAdaptor.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAdaptor.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAdaptor.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyLinkRewritingParserAdaptor.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -24,8 +24,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
-import org.apache.portals.applications.webcontent.util.CharArraySegment;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapper;
+import org.apache.portals.applications.webcontent2.util.CharArraySegment;
 
 /**
  * A simple reverse proxy link rewriting parser adaptor implementation.

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRequestContextProvider.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRequestContextProvider.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRequestContextProvider.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRequestContextProvider.java Wed Jul  2 01:57:01 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRequestContextProvider;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRequestContextProvider;
 
 /**
  * DefaultReverseProxyRequestContextProvider

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRewritingContext.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRewritingContext.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRewritingContext.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultReverseProxyRewritingContext.java Wed Jul  2 01:57:01 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapperProvider;
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRewritingContext;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapper;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapperProvider;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRewritingContext;
 
 /**
  * DefaultReverseProxyRewritingContext

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultSSOSiteCredentials.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultSSOSiteCredentials.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultSSOSiteCredentials.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultSSOSiteCredentials.java Wed Jul  2 01:57:01 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
-import org.apache.portals.applications.webcontent.proxy.SSOSiteCredentials;
+import org.apache.portals.applications.webcontent2.proxy.SSOSiteCredentials;
 
 public class DefaultSSOSiteCredentials implements SSOSiteCredentials
 {

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleanerImpl.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleanerImpl.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleanerImpl.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/DefaultURICleanerImpl.java Wed Jul  2 01:57:01 2014
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.util.ArrayList;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.portals.applications.webcontent.proxy.URICleaner;
+import org.apache.portals.applications.webcontent2.proxy.URICleaner;
 
 /**
  * DefaultURICleanerImpl

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpRoutePlanner.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpRoutePlanner.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/ProxyHttpRoutePlanner.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.net.InetAddress;
 import java.util.Map;

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/RewritableHttpReverseProxyServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/RewritableHttpReverseProxyServiceImpl.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/RewritableHttpReverseProxyServiceImpl.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/proxy/impl/RewritableHttpReverseProxyServiceImpl.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.proxy.impl;
+package org.apache.portals.applications.webcontent2.proxy.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -75,22 +75,22 @@ import org.apache.http.params.BasicHttpP
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyConstants;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyException;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyNotFoundException;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapperProvider;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyService;
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRequestContextProvider;
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRewritingContext;
-import org.apache.portals.applications.webcontent.proxy.ReverseProxyRewritingContextAware;
-import org.apache.portals.applications.webcontent.proxy.SSOSiteCredentials;
-import org.apache.portals.applications.webcontent.proxy.SSOSiteCredentialsProvider;
-import org.apache.portals.applications.webcontent.proxy.URICleaner;
-import org.apache.portals.applications.webcontent.rewriter.ParserAdaptor;
-import org.apache.portals.applications.webcontent.rewriter.Rewriter;
-import org.apache.portals.applications.webcontent.rewriter.RewriterController;
-import org.apache.portals.applications.webcontent.rewriter.rules.Ruleset;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyConstants;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyException;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyNotFoundException;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapper;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyPathMapperProvider;
+import org.apache.portals.applications.webcontent2.proxy.HttpReverseProxyService;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRequestContextProvider;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRewritingContext;
+import org.apache.portals.applications.webcontent2.proxy.ReverseProxyRewritingContextAware;
+import org.apache.portals.applications.webcontent2.proxy.SSOSiteCredentials;
+import org.apache.portals.applications.webcontent2.proxy.SSOSiteCredentialsProvider;
+import org.apache.portals.applications.webcontent2.proxy.URICleaner;
+import org.apache.portals.applications.webcontent2.rewriter.ParserAdaptor;
+import org.apache.portals.applications.webcontent2.rewriter.Rewriter;
+import org.apache.portals.applications.webcontent2.rewriter.RewriterController;
+import org.apache.portals.applications.webcontent2.rewriter.rules.Ruleset;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/CharArraySegment.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/CharArraySegment.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/CharArraySegment.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/CharArraySegment.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.util;
+package org.apache.portals.applications.webcontent2.util;
 
 import javax.swing.text.Segment;
 

Modified: portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/WebResourceUtils.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/WebResourceUtils.java?rev=1607228&r1=1607227&r2=1607228&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/WebResourceUtils.java (original)
+++ portals/applications/webcontent/trunk/reverse-proxy/src/main/java/org/apache/portals/applications/webcontent2/util/WebResourceUtils.java Wed Jul  2 01:57:01 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.portals.applications.webcontent.util;
+package org.apache.portals.applications.webcontent2.util;
 
 import java.io.File;
 import java.io.FileInputStream;