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 -->
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.