Author: lindner
Date: Sun Jan 31 03:30:58 2010
New Revision: 904965
URL: http://svn.apache.org/viewvc?rev=904965&view=rev
Log:
Revert "Take advantage of gadget rewritter and apply it on arbitrary html page."
This reverts commit 2ed156582d1bbe19c8ac0754c9a632171eebd86d.
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/features.txt
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/features.txt?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/features.txt
(original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/features.txt
Sun Jan 31 03:30:58 2010
@@ -28,7 +28,6 @@
features/core.json/feature.xml
features/core.legacy/feature.xml
features/core.log/feature.xml
-features/core.none/feature.xml
features/core.prefs/feature.xml
features/core.util/feature.xml
features/core/feature.xml
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
Sun Jan 31 03:30:58 2010
@@ -24,7 +24,6 @@
import org.apache.shindig.common.xml.XmlException;
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.http.RequestPipeline;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.SpecParserException;
@@ -43,7 +42,7 @@
public class DefaultGadgetSpecFactory extends AbstractSpecFactory<GadgetSpec>
implements GadgetSpecFactory {
public static final String CACHE_NAME = "gadgetSpecs";
- public static final String RAW_GADGETSPEC_XML_PARAM_NAME = "rawxml";
+ static final String RAW_GADGETSPEC_XML_PARAM_NAME = "rawxml";
static final Uri RAW_GADGET_URI = Uri.parse("http://localhost/raw.xml";);
@Inject
@@ -64,14 +63,8 @@
// Set URI to a fixed, safe value (localhost), preventing a gadget
rendered
// via raw XML (eg. via POST) to be rendered on a locked domain of any
other
// gadget whose spec is hosted non-locally.
- try
- {
- Uri uri = RAW_GADGET_URI;
- // For accelerate page, pass in page url instead of fake one
- if (HtmlAccelServlet.isAccel(context)) {
- uri = context.getUrl();
- }
- return new GadgetSpec(uri, XmlUtil.parse(rawxml), rawxml);
+ try {
+ return new GadgetSpec(RAW_GADGET_URI, XmlUtil.parse(rawxml), rawxml);
} catch (XmlException e) {
throw new SpecParserException(e);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/HtmlRenderer.java
Sun Jan 31 03:30:58 2010
@@ -29,9 +29,11 @@
import org.apache.shindig.gadgets.spec.View;
import java.util.Collection;
+import java.util.List;
import com.google.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
@@ -41,17 +43,17 @@
public static final String PATH_PARAM = "path";
private final PreloaderService preloader;
private final ProxyRenderer proxyRenderer;
- private final GadgetRewritersProvider rewritersProvider;
+ private final List<GadgetRewriter> gadgetRewriters;
private final GadgetHtmlParser htmlParser;
@Inject
public HtmlRenderer(PreloaderService preloader,
ProxyRenderer proxyRenderer,
- GadgetRewritersProvider rewritersProvider,
+ List<GadgetRewriter> gadgetRewriters,
GadgetHtmlParser htmlParser) {
this.preloader = preloader;
this.proxyRenderer = proxyRenderer;
- this.rewritersProvider = rewritersProvider;
+ this.gadgetRewriters = gadgetRewriters;
this.htmlParser = htmlParser;
}
@@ -85,8 +87,7 @@
}
MutableContent mc = new MutableContent(htmlParser, content);
- for (GadgetRewriter rewriter :
- rewritersProvider.getRewriters(gadget.getContext())) {
+ for (GadgetRewriter rewriter : gadgetRewriters) {
rewriter.rewrite(gadget, mc);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
Sun Jan 31 03:30:58 2010
@@ -31,7 +31,6 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.TypeLiteral;
-import com.google.inject.name.Names;
/**
* Guice bindings for the rewrite package.
@@ -40,12 +39,7 @@
@Override
protected void configure() {
- bind(new TypeLiteral<List<GadgetRewriter>>(){})
- .annotatedWith(Names.named("shindig.rewriters.gadget"))
- .toProvider(GadgetRewritersProvider.class);
- bind(new TypeLiteral<List<GadgetRewriter>>(){})
- .annotatedWith(Names.named("shindig.rewriters.accelerate"))
- .toProvider(AccelRewritersProvider.class);
+ bind(new
TypeLiteral<List<GadgetRewriter>>(){}).toProvider(GadgetRewritersProvider.class);
bind(new
TypeLiteral<List<RequestRewriter>>(){}).toProvider(RequestRewritersProvider.class);
}
@@ -53,7 +47,7 @@
private final List<GadgetRewriter> rewriters;
@Inject
- private GadgetRewritersProvider(PipelineDataGadgetRewriter
pipelineRewriter,
+ public GadgetRewritersProvider(PipelineDataGadgetRewriter pipelineRewriter,
TemplateRewriter templateRewriter,
HTMLContentRewriter optimizingRewriter,
CssRequestRewriter cssRewriter,
@@ -76,28 +70,11 @@
}
}
- private static class AccelRewritersProvider implements
Provider<List<GadgetRewriter>> {
- private final List<GadgetRewriter> rewriters;
-
- @Inject
- private AccelRewritersProvider(
- HTMLContentRewriter optimizingRewriter,
- CajaContentRewriter cajaRewriter) {
- rewriters = Lists.newArrayList();
- rewriters.add(optimizingRewriter);
- rewriters.add(cajaRewriter);
- }
-
- public List<GadgetRewriter> get() {
- return rewriters;
- }
- }
-
private static class RequestRewritersProvider implements
Provider<List<RequestRewriter>> {
private final List<RequestRewriter> rewriters;
@Inject
- private RequestRewritersProvider(HTMLContentRewriter optimizingRewriter,
+ public RequestRewritersProvider(HTMLContentRewriter optimizingRewriter,
CssRequestRewriter cssRewriter,
SanitizingRequestRewriter sanitizedRewriter) {
rewriters = Lists.newArrayList();
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
Sun Jan 31 03:30:58 2010
@@ -32,7 +32,6 @@
import org.apache.shindig.gadgets.preload.PreloaderService;
import org.apache.shindig.gadgets.rewrite.CaptureRewriter;
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.View;
import org.junit.Before;
@@ -59,20 +58,9 @@
}
};
- private static final GadgetContext ACCEL_CONTEXT = new GadgetContext() {
- @Override
- public String getParameter(String name) {
- if (name == HtmlAccelServlet.ACCEL_GADGET_PARAM_NAME) {
- return HtmlAccelServlet.ACCEL_GADGET_PARAM_VALUE;
- }
- return super.getParameter(name);
- }
- };
-
private final FakePreloaderService preloaderService = new
FakePreloaderService();
private final FakeProxyRenderer proxyRenderer = new FakeProxyRenderer();
private final CaptureRewriter captureRewriter = new CaptureRewriter();
- private final CaptureRewriter accelRewriter = new CaptureRewriter();
private HtmlRenderer renderer;
private Gadget makeGadget(String content) throws GadgetException {
@@ -96,9 +84,7 @@
@Before
public void setUp() throws Exception {
renderer = new HtmlRenderer(preloaderService, proxyRenderer,
- new GadgetRewritersProvider(ImmutableList.of((GadgetRewriter)
captureRewriter),
- ImmutableList.of((GadgetRewriter) accelRewriter)),
- null);
+ ImmutableList.of((GadgetRewriter) captureRewriter), null);
}
@@ -126,13 +112,6 @@
assertTrue("Rewriting not performed.", captureRewriter.viewWasRewritten());
}
- @Test
- public void doAccelRewriting() throws Exception {
- renderer.render(makeGadget(BASIC_HTML_CONTENT).setContext(ACCEL_CONTEXT));
- assertTrue("Rewriting should not be not performed.",
!captureRewriter.viewWasRewritten());
- assertTrue("Rewriting not performed.", accelRewriter.viewWasRewritten());
- }
-
private static class FakeProxyRenderer extends ProxyRenderer {
public FakeProxyRenderer() {
super(null, null, null);
@@ -161,5 +140,4 @@
return preloads;
}
}
-
}
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
Sun Jan 31 03:30:58 2010
@@ -78,14 +78,6 @@
</servlet-class>
</servlet>
- <!-- Accelerate a page -->
- <servlet>
- <servlet-name>accel</servlet-name>
- <servlet-class>
- org.apache.shindig.gadgets.servlet.HtmlAccelServlet
- </servlet-class>
- </servlet>
-
<!-- Proxy -->
<servlet>
<servlet-name>proxy</servlet-name>
@@ -220,11 +212,6 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>accel</servlet-name>
- <url-pattern>/gadgets/accel</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>metadata</servlet-name>
<url-pattern>/gadgets/metadata</url-pattern>
</servlet-mapping>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Sun Jan
31 03:30:58 2010
@@ -122,13 +122,6 @@
</servlet-class>
</servlet>
- <servlet>
- <servlet-name>accel</servlet-name>
- <servlet-class>
- org.apache.shindig.gadgets.servlet.HtmlAccelServlet
- </servlet-class>
- </servlet>
-
<!-- Proxy -->
<servlet>
<servlet-name>proxy</servlet-name>
@@ -271,11 +264,6 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>accel</servlet-name>
- <url-pattern>/gadgets/accel</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>metadata</servlet-name>
<url-pattern>/gadgets/metadata</url-pattern>
</servlet-mapping>
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java?rev=904965&r1=904964&r2=904965&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
Sun Jan 31 03:30:58 2010
@@ -17,16 +17,13 @@
*/
package org.apache.shindig.server;
-import org.apache.commons.collections.map.HashedMap;
import org.apache.shindig.auth.AuthenticationServletFilter;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.common.servlet.GuiceServletContextListener;
-import org.apache.shindig.gadgets.DefaultGadgetSpecFactory;
import org.apache.shindig.gadgets.DefaultGuiceModule;
import org.apache.shindig.gadgets.oauth.OAuthModule;
import org.apache.shindig.gadgets.servlet.ConcatProxyServlet;
import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
import org.apache.shindig.gadgets.servlet.JsServlet;
import org.apache.shindig.gadgets.servlet.MakeRequestServlet;
import org.apache.shindig.gadgets.servlet.ProxyServlet;
@@ -41,7 +38,6 @@
import org.mortbay.resource.Resource;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
import com.google.common.base.Joiner;
@@ -53,7 +49,6 @@
public class JettyLauncher {
private static final String GADGET_BASE = "/gadgets/ifr";
- private static final String ACCEL_BASE = "/gadgets/accel";
private static final String PROXY_BASE = "/gadgets/proxy";
private static final String MAKEREQUEST_BASE = "/gadgets/makeRequest";
private static final String GADGETS_RPC_BASE = "/gadgets/api/rpc/*";
@@ -109,11 +104,6 @@
context.addServlet(gadgetServletHolder, GADGET_BASE);
context.addFilter(AuthenticationServletFilter.class, GADGET_BASE, 0);
- // Attach the html acceleration rendering servlet
- ServletHolder accelServletHolder = new ServletHolder(new
HtmlAccelServlet());
- context.addServlet(accelServletHolder, ACCEL_BASE);
- context.addFilter(AuthenticationServletFilter.class, ACCEL_BASE, 0);
-
// Attach the make-request servlet
ServletHolder makeRequestHolder = new ServletHolder(new
MakeRequestServlet());
context.addServlet(makeRequestHolder, MAKEREQUEST_BASE);
