Author: woonsan
Date: Wed Jul 2 02:02:58 2014
New Revision: 1607229
URL: http://svn.apache.org/r1607229
Log:
APA-58: renaming packages
Modified:
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFrameGenericPortlet.java
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFramePortlet.java
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryList.java
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryPage.java
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentPortlet.java
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentResource.java
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/reverseproxy.properties
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/portlet.xml
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/view/iframe-record-visit.jsp
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/web.xml
Modified:
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFrameGenericPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFrameGenericPortlet.java?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFrameGenericPortlet.java
(original)
+++
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFrameGenericPortlet.java
Wed Jul 2 02:02:58 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.portlet;
+package org.apache.portals.applications.webcontent2.portlet;
import java.io.IOException;
import java.io.StringWriter;
@@ -51,9 +51,9 @@ import org.w3c.dom.Element;
public class IFrameGenericPortlet extends GenericVelocityPortlet
{
- public static final String IFRAME_AUTORESIZE_SCRIPT_ID =
"org.apache.portals.applications.webcontent.portlet.iframe.autoresize";
+ public static final String IFRAME_AUTORESIZE_SCRIPT_ID =
"org.apache.portals.applications.webcontent2.portlet.iframe.autoresize";
- public static final String IFRAME_SRC_URL =
"org.apache.portals.applications.webcontent.portlet.iframe.src";
+ public static final String IFRAME_SRC_URL =
"org.apache.portals.applications.webcontent2.portlet.iframe.src";
public static final String [] SRC_REPLACE_KEYS = { "${serverName}",
"${serverPort}", "${contextPath}" };
Modified:
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFramePortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFramePortlet.java?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFramePortlet.java
(original)
+++
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/IFramePortlet.java
Wed Jul 2 02:02:58 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.portlet;
+package org.apache.portals.applications.webcontent2.portlet;
import java.io.IOException;
import javax.portlet.GenericPortlet;
Modified:
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryList.java
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryList.java?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryList.java
(original)
+++
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryList.java
Wed Jul 2 02:02:58 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.portlet;
+package org.apache.portals.applications.webcontent2.portlet;
import java.io.Serializable;
import java.util.ArrayList;
Modified:
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryPage.java
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryPage.java?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryPage.java
(original)
+++
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentHistoryPage.java
Wed Jul 2 02:02:58 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.portlet;
+package org.apache.portals.applications.webcontent2.portlet;
import java.io.Serializable;
import java.util.HashMap;
Modified:
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentPortlet.java
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentPortlet.java?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentPortlet.java
(original)
+++
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentPortlet.java
Wed Jul 2 02:02:58 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.portlet;
+package org.apache.portals.applications.webcontent2.portlet;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -59,14 +59,14 @@ import org.apache.commons.httpclient.Pro
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.MultipartPostMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-import
org.apache.portals.applications.webcontent.rewriter.MappingRewriterController;
-import org.apache.portals.applications.webcontent.rewriter.RewriterController;
-import org.apache.portals.applications.webcontent.rewriter.RewriterException;
-import org.apache.portals.applications.webcontent.rewriter.RulesetRewriter;
-import org.apache.portals.applications.webcontent.rewriter.WebContentRewriter;
-import
org.apache.portals.applications.webcontent.rewriter.html.neko.NekoParserAdaptor;
-import org.apache.portals.applications.webcontent.rewriter.rules.Ruleset;
-import
org.apache.portals.applications.webcontent.rewriter.xml.SaxParserAdaptor;
+import
org.apache.portals.applications.webcontent2.rewriter.MappingRewriterController;
+import org.apache.portals.applications.webcontent2.rewriter.RewriterController;
+import org.apache.portals.applications.webcontent2.rewriter.RewriterException;
+import org.apache.portals.applications.webcontent2.rewriter.RulesetRewriter;
+import org.apache.portals.applications.webcontent2.rewriter.WebContentRewriter;
+import
org.apache.portals.applications.webcontent2.rewriter.html.neko.NekoParserAdaptor;
+import org.apache.portals.applications.webcontent2.rewriter.rules.Ruleset;
+import
org.apache.portals.applications.webcontent2.rewriter.xml.SaxParserAdaptor;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
import org.apache.portals.messaging.PortletMessaging;
Modified:
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentResource.java
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentResource.java?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentResource.java
(original)
+++
portals/applications/webcontent/trunk/portlets/src/main/java/org/apache/portals/applications/webcontent2/portlet/WebContentResource.java
Wed Jul 2 02:02:58 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.portlet;
+package org.apache.portals.applications.webcontent2.portlet;
import java.io.Serializable;
Modified:
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/reverseproxy.properties
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/reverseproxy.properties?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/reverseproxy.properties
(original)
+++
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/reverseproxy.properties
Wed Jul 2 02:02:58 2014
@@ -39,7 +39,7 @@ proxy.http.client.param.allowCircularRed
# Invoking URI Cleaner used to clean remote URI just before invoking HTTP
Client Methods
-proxy.http.client.default.uri.cleaner =
org.apache.portals.applications.webcontent.proxy.impl.DefaultURICleanerImpl
+proxy.http.client.default.uri.cleaner =
org.apache.portals.applications.webcontent2.proxy.impl.DefaultURICleanerImpl
# The default URI Cleaner replaces spaces by '%20'. You may add additional
searchList/replacementList below.
proxy.http.client.default.uri.cleaner.param.searchList = \u005E
proxy.http.client.default.uri.cleaner.param.replacementList = %5E
@@ -101,27 +101,27 @@ proxy.reverse.pass.maxMatchingPathPartCo
# ... Sets detail attributes for apache path mapping
proxy.reverse.pass.apache.local = /apache/
proxy.reverse.pass.apache.remote = http://apache.org/
-proxy.reverse.pass.apache.rewriter.basic =
org.apache.portals.applications.webcontent.rewriter.WebContentRewriter
+proxy.reverse.pass.apache.rewriter.basic =
org.apache.portals.applications.webcontent2.rewriter.WebContentRewriter
proxy.reverse.pass.apache.rewriter.parserAdaptor = html
-proxy.reverse.pass.apache.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent.proxy.impl.DefaultReverseProxyLinkRewritingParserAdaptor
+proxy.reverse.pass.apache.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent2.proxy.impl.DefaultReverseProxyLinkRewritingParserAdaptor
proxy.reverse.pass.apache.rewriter.parserAdaptor.html.mimeType = text/html
proxy.reverse.pass.apache.rewriter.parserAdaptor.html.property.lookUpAllMappings
= true
# ... Sets detail attributes for glob-based apache path mapping
proxy.reverse.pass.all_apache.local = /*_apache/
proxy.reverse.pass.all_apache.remote = http://$1.apache.org/
-proxy.reverse.pass.all_apache.rewriter.basic =
org.apache.portals.applications.webcontent.rewriter.WebContentRewriter
+proxy.reverse.pass.all_apache.rewriter.basic =
org.apache.portals.applications.webcontent2.rewriter.WebContentRewriter
proxy.reverse.pass.all_apache.rewriter.parserAdaptor = html
-proxy.reverse.pass.all_apache.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent.proxy.impl.DefaultReverseProxyLinkRewritingParserAdaptor
+proxy.reverse.pass.all_apache.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent2.proxy.impl.DefaultReverseProxyLinkRewritingParserAdaptor
proxy.reverse.pass.all_apache.rewriter.parserAdaptor.html.mimeType = text/html
proxy.reverse.pass.all_apache.rewriter.parserAdaptor.html.property.lookUpAllMappings
= true
# ... Sets detail attributes for secure apache path mapping
proxy.reverse.pass.secure_apache.local = /secure/apache/
proxy.reverse.pass.secure_apache.remote = https://apache.org/
-proxy.reverse.pass.secure_apache.rewriter.basic =
org.apache.portals.applications.webcontent.rewriter.WebContentRewriter
+proxy.reverse.pass.secure_apache.rewriter.basic =
org.apache.portals.applications.webcontent2.rewriter.WebContentRewriter
proxy.reverse.pass.secure_apache.rewriter.parserAdaptor = html
-proxy.reverse.pass.secure_apache.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent.proxy.impl.DefaultReverseProxyLinkRewritingParserAdaptor
+proxy.reverse.pass.secure_apache.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent2.proxy.impl.DefaultReverseProxyLinkRewritingParserAdaptor
proxy.reverse.pass.secure_apache.rewriter.parserAdaptor.html.mimeType =
text/html
proxy.reverse.pass.secure_apache.rewriter.parserAdaptor.html.property.lookUpAllMappings
= true
@@ -134,12 +134,12 @@ proxy.reverse.pass.localhost.remote = ht
proxy.reverse.pass.somewhere.local = /somewhere/
proxy.reverse.pass.somewhere.remote = http://somewhere.localhost.com/
# ... rewriter configuration for this pass mapping on html and xml types.
-proxy.reverse.pass.somewhere.rewriter.basic =
org.apache.portals.applications.webcontent.rewriter.WebContentRewriter
-proxy.reverse.pass.somewhere.rewriter.rulebased =
org.apache.portals.applications.webcontent.rewriter.WebContentRewriter
+proxy.reverse.pass.somewhere.rewriter.basic =
org.apache.portals.applications.webcontent2.rewriter.WebContentRewriter
+proxy.reverse.pass.somewhere.rewriter.rulebased =
org.apache.portals.applications.webcontent2.rewriter.WebContentRewriter
proxy.reverse.pass.somewhere.rewriter.parserAdaptor = html, xml
-proxy.reverse.pass.somewhere.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent.rewriter.html.neko.NekoParserAdaptor
+proxy.reverse.pass.somewhere.rewriter.parserAdaptor.html =
org.apache.portals.applications.webcontent2.rewriter.html.neko.NekoParserAdaptor
proxy.reverse.pass.somewhere.rewriter.parserAdaptor.html.mimeType = text/html
-proxy.reverse.pass.somewhere.rewriter.parserAdaptor.xml =
org.apache.portals.applications.webcontent.rewriter.xml.SaxParserAdaptor
+proxy.reverse.pass.somewhere.rewriter.parserAdaptor.xml =
org.apache.portals.applications.webcontent2.rewriter.xml.SaxParserAdaptor
proxy.reverse.pass.somewhere.rewriter.parserAdaptor.xml.mimeType = text/xml
proxy.reverse.pass.somewhere.rewriter.ruleMappings =
/WEB-INF/conf/rewriter-rules-mapping.xml
proxy.reverse.pass.somewhere.rewriter.rules =
/WEB-INF/conf/default-rewriter-rules.xml
Modified:
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml
(original)
+++
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/conf/rewriter-rules-mapping.xml
Wed Jul 2 02:02:58 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.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.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.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.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.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.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.rewriter.rules.impl.AttributeImpl">
<map-to xml="attribute"/>
<field name="id" type="java.lang.String">
Modified:
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/portlet.xml?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/portlet.xml
(original)
+++
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/portlet.xml
Wed Jul 2 02:02:58 2014
@@ -26,7 +26,7 @@
<portlet-name>IFramePortlet</portlet-name>
<display-name>IFrame Portlet</display-name>
<portlet-class>
-
org.apache.portals.applications.webcontent.portlet.IFrameGenericPortlet</portlet-class>
+
org.apache.portals.applications.webcontent2.portlet.IFrameGenericPortlet</portlet-class>
<init-param>
<name>EditPage</name>
<value>/WEB-INF/view/edit-prefs.vm</value>
@@ -110,7 +110,7 @@
<portlet-name>ReverseProxyIFramePortlet</portlet-name>
<display-name>ReverseProxy IFrame Portlet</display-name>
<portlet-class>
-
org.apache.portals.applications.webcontent.portlet.IFrameGenericPortlet</portlet-class>
+
org.apache.portals.applications.webcontent2.portlet.IFrameGenericPortlet</portlet-class>
<init-param>
<name>EditPage</name>
<value>/WEB-INF/view/edit-prefs.vm</value>
@@ -200,7 +200,7 @@
<description>Includes the content of another website inside the portal
without using frames. All links are rewritten back to the portal to attempt to
proxy all content through the portal.</description>
<portlet-name>WebContentPortlet</portlet-name>
<display-name>WebContent Portlet</display-name>
-
<portlet-class>org.apache.portals.applications.webcontent.portlet.WebContentPortlet</portlet-class>
+
<portlet-class>org.apache.portals.applications.webcontent2.portlet.WebContentPortlet</portlet-class>
<init-param>
<name>EditPage</name>
<value>/WEB-INF/view/edit-wcprefs.vm</value>
Modified:
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/view/iframe-record-visit.jsp
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/view/iframe-record-visit.jsp?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
---
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/view/iframe-record-visit.jsp
(original)
+++
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/view/iframe-record-visit.jsp
Wed Jul 2 02:02:58 2014
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ page language="java" import="javax.portlet.PortletRequest,
org.apache.portals.messaging.PortletMessaging,
org.apache.portals.applications.webcontent.portlet.IFrameGenericPortlet"
session="true" %>
+<%@ page language="java" import="javax.portlet.PortletRequest,
org.apache.portals.messaging.PortletMessaging,
org.apache.portals.applications.webcontent2.portlet.IFrameGenericPortlet"
session="true" %>
<%
String url = request.getParameter("URL");
Modified:
portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/web.xml?rev=1607229&r1=1607228&r2=1607229&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/web.xml
(original)
+++ portals/applications/webcontent/trunk/war/src/main/webapp/WEB-INF/web.xml
Wed Jul 2 02:02:58 2014
@@ -50,7 +50,7 @@
<!-- Default Reverse Proxy Servlet -->
<servlet>
<servlet-name>ReverseProxyServlet</servlet-name>
-
<servlet-class>org.apache.portals.applications.webcontent.proxy.impl.DefaultHttpReverseProxyServlet</servlet-class>
+
<servlet-class>org.apache.portals.applications.webcontent2.proxy.impl.DefaultHttpReverseProxyServlet</servlet-class>
<init-param>
<param-name>reverseproxy.configuration</param-name>
<param-value>/WEB-INF/conf/reverseproxy*.properties</param-value>
