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 2009/09/29 18:59:40 UTC
svn commit: r820030 - in
/portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl:
DefaultHttpReverseProxyServlet.java
RewritableHttpReverseProxyServiceImpl.java
Author: woonsan
Date: Tue Sep 29 16:59:40 2009
New Revision: 820030
URL: http://svn.apache.org/viewvc?rev=820030&view=rev
Log:
APA-17: Clean up to enable default rewriter use.
Modified:
portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java
portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/RewritableHttpReverseProxyServiceImpl.java
Modified: portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java?rev=820030&r1=820029&r2=820030&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java Tue Sep 29 16:59:40 2009
@@ -153,14 +153,17 @@
String [] rewriterRuleConfs = pathPassConf.getStringArray("rules");
String [] adaptorClassNames = pathPassConf.getStringArray("adaptors");
- if (ArrayUtils.getLength(rewriterRuleConfs) == 2)
+ int rewriterRuleConfsLength = ArrayUtils.getLength(rewriterRuleConfs);
+
+ if (rewriterRuleConfsLength > 0)
{
RewriterController rewriterController = createRewriterController(rewriterRuleConfs[0], rewriterClassNames, adaptorClassNames);
if (rewriterController != null)
{
rewriterControllerPairs.add(new DefaultKeyValue(localBasePath, rewriterController));
- Rewriter rewriter = createRewriter(rewriterController, rewriterRuleConfs[1]);
+ String rewriterRuleConf = (rewriterRuleConfsLength > 1 ? rewriterRuleConfs[1] : null);
+ Rewriter rewriter = createRewriter(rewriterController, rewriterRuleConf);
rewriterPairs.add(new DefaultKeyValue(localBasePath, rewriter));
}
}
@@ -304,8 +307,15 @@
try
{
- rewriterRulesInput = getServletContext().getResourceAsStream(rewriterRulesResourcePath);
- rewriter = rwc.createRewriter(rwc.loadRuleset(rewriterRulesInput));
+ if (!StringUtils.isBlank(rewriterRulesResourcePath))
+ {
+ rewriterRulesInput = getServletContext().getResourceAsStream(rewriterRulesResourcePath);
+ rewriter = rwc.createRewriter(rwc.loadRuleset(rewriterRulesInput));
+ }
+ else
+ {
+ rewriter = rwc.createRewriter();
+ }
}
finally
{
Modified: portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/RewritableHttpReverseProxyServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/RewritableHttpReverseProxyServiceImpl.java?rev=820030&r1=820029&r2=820030&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/RewritableHttpReverseProxyServiceImpl.java (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/RewritableHttpReverseProxyServiceImpl.java Tue Sep 29 16:59:40 2009
@@ -462,7 +462,6 @@
}
}
- ParserAdaptor parserAdaptor = rewriterController.createParserAdaptor(mimeType);
String responseCharSet = EntityUtils.getContentCharSet(httpEntity);
if (responseCharSet != null)
@@ -476,7 +475,7 @@
writer = new OutputStreamWriter(out);
}
- rewriter.rewrite(parserAdaptor, reader, writer);
+ rewriter.rewrite(rewriterController.createParserAdaptor(mimeType), reader, writer);
writer.flush();
}
}