Return-Path: 
 <jetspeed-dev-return-37548-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
X-Original-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EE296110EF
	for <apmail-portals-jetspeed-dev-archive@www.apache.org>;
 Fri,  5 Sep 2014 04:04:46 +0000 (UTC)
Received: (qmail 17963 invoked by uid 500); 5 Sep 2014 04:04:46 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 17924 invoked by uid 500); 5 Sep 2014 04:04:46 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 17913 invoked by uid 99); 5 Sep 2014 04:04:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Sep 2014 04:04:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Sep 2014 04:04:23 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id DA69A23889E0;
	Fri,  5 Sep 2014 04:04:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1622614 - in
 /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF:
 conf/reverseproxy.properties conf/rewriter-rules-mapping.xml
 rproxy-mappings.yaml web.xml
Date: Fri, 05 Sep 2014 04:04:21 -0000
To: jetspeed-dev@portals.apache.org
From: woonsan@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140905040421.DA69A23889E0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: woonsan
Date: Fri Sep  5 04:04:21 2014
New Revision: 1622614

URL: http://svn.apache.org/r1622614
Log:
JS2-1302: default rproxy mapping configuration

Added:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/rproxy-mappings.yaml
Removed:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/conf/reverseproxy.properties
Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml?rev=1622614&r1=1622613&r2=1622614&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml Fri Sep  5 04:04:21 2014
@@ -16,7 +16,7 @@ See the License for the specific languag
 limitations under the License.
 -->
 <mapping>
-  <class name="org.apache.portals.applications.webcontent.rewriter.rules.impl.RulesetImpl">
+  <class name="org.apache.portals.applications.webcontent2.portlet.rewriter.rules.impl.RulesetImpl">
     <map-to xml="ruleset"/>
 
     <field name="id" type="java.lang.String">
@@ -28,20 +28,20 @@ limitations under the License.
     </field>
                                    
     <field name="tags"
-           type="org.apache.portals.applications.webcontent.rewriter.rules.impl.TagImpl"
+           type="org.apache.portals.applications.webcontent2.portlet.rewriter.rules.impl.TagImpl"
            collection="collection">
       <bind-xml name="tag"/>
     </field>
 
     <field name="rules"
-           type="org.apache.portals.applications.webcontent.rewriter.rules.impl.RuleImpl"
+           type="org.apache.portals.applications.webcontent2.portlet.rewriter.rules.impl.RuleImpl"
            collection="collection">
       <bind-xml name="rule"/>
     </field>
 
   </class>
 
-  <class name="org.apache.portals.applications.webcontent.rewriter.rules.impl.TagImpl">
+  <class name="org.apache.portals.applications.webcontent2.portlet.rewriter.rules.impl.TagImpl">
     <map-to xml="tag"/>
                                    
     <field name="id" type="java.lang.String">
@@ -57,14 +57,14 @@ limitations under the License.
     </field>
 
     <field name="attributes"
-           type="org.apache.portals.applications.webcontent.rewriter.rules.impl.AttributeImpl"
+           type="org.apache.portals.applications.webcontent2.portlet.rewriter.rules.impl.AttributeImpl"
            collection="collection">
       <bind-xml name="attribute"/>
     </field>
 
   </class>
 
-  <class name="org.apache.portals.applications.webcontent.rewriter.rules.impl.RuleImpl">
+  <class name="org.apache.portals.applications.webcontent2.portlet.rewriter.rules.impl.RuleImpl">
     <map-to xml="rule"/>
                                    
     <field name="id" type="java.lang.String">
@@ -89,7 +89,7 @@ limitations under the License.
 
   </class>
 
-  <class name="org.apache.portals.applications.webcontent.rewriter.rules.impl.AttributeImpl">
+  <class name="org.apache.portals.applications.webcontent2.portlet.rewriter.rules.impl.AttributeImpl">
     <map-to xml="attribute"/>
                                    
     <field name="id" type="java.lang.String">

Added: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/rproxy-mappings.yaml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/rproxy-mappings.yaml?rev=1622614&view=auto
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/rproxy-mappings.yaml (added)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/rproxy-mappings.yaml Fri Sep  5 04:04:21 2014
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+--- !regex
+localPattern: ^/localhost_(\d+)/(.*)$
+remoteReplace: http://localhost:$1/$2
+remotePattern: ^http://localhost:(\d+)/(.*)$
+localReplace: /localhost_$1/$2
+contentRewriters:
+    text/html: !!org.apache.portals.applications.webcontent2.proxy.rewriter.DefaultReverseProxyTextLineContentRewriter []

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml?rev=1622614&r1=1622613&r2=1622614&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/web.xml Fri Sep  5 04:04:21 2014
@@ -208,17 +208,13 @@
   <!-- Default Reverse Proxy Servlet -->
   <servlet>
     <servlet-name>ReverseProxyServlet</servlet-name>
-    <servlet-class>
-      org.apache.portals.applications.webcontent.proxy.impl.DefaultHttpReverseProxyServlet</servlet-class>
-    <init-param>
-      <param-name>reverseproxy.configuration</param-name>
-      <param-value>/WEB-INF/conf/reverseproxy*.properties</param-value>
-    </init-param>
+    <servlet-class>org.apache.portals.applications.webcontent2.proxy.servlet.SimpleReverseProxyServlet</servlet-class>
     <init-param>
-      <param-name>reverseproxy.configuration.refresh.delay</param-name>
-      <param-value>60000</param-value>
+      <param-name>mappings</param-name>
+      <param-value>
+        /WEB-INF/rproxy-mappings.yaml
+      </param-value>
     </init-param>
-    <load-on-startup>11</load-on-startup>
   </servlet>
 
   <!-- Define Velocity Servlet -->



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