You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/08/13 09:52:47 UTC
svn commit: r985121 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/uri/
test/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/uri/
Author: lindner
Date: Fri Aug 13 07:52:47 2010
New Revision: 985121
URL: http://svn.apache.org/viewvc?rev=985121&view=rev
Log:
bring back schemeless URLs
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=985121&r1=985120&r2=985121&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java Fri Aug 13 07:52:47 2010
@@ -120,8 +120,6 @@ public class DefaultProxyUriManager impl
String container = puc.getContainer();
UriBuilder uri = new UriBuilder();
- // TODO need to decide http vs https
- uri.setScheme("http");
uri.setAuthority(getReqConfig(container, PROXY_HOST_PARAM));
// Chained vs. query-style syntax is determined by the presence of CHAINED_PARAMS_TOKEN
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java?rev=985121&r1=985120&r2=985121&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java Fri Aug 13 07:52:47 2010
@@ -72,12 +72,12 @@ public class StyleTagProxyEmbeddedUrlsVi
String expected =
"<html><head>"
+ "<style>"
- + "@import url('http://localhost:8080/gadgets/proxy?container=default&"
+ + "@import url('//localhost:8080/gadgets/proxy?container=default&"
+ "gadget=http%3A%2F%2F1.com%2F&debug=0&nocache=0"
+ "&url=http%3A%2F%2F1.com%2F1.css');\n"
+ "P {color:blue;}"
+ "P {color:red;}"
- + "A {background: url('http://localhost:8080/gadgets/proxy?container=default"
+ + "A {background: url('//localhost:8080/gadgets/proxy?container=default"
+ "&gadget=http%3A%2F%2F1.com%2F&debug=0&nocache=0"
+ "&url=http%3A%2F%2F1.com%2F2.jpg');}"
+ "</style></head>"
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java?rev=985121&r1=985120&r2=985121&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java Fri Aug 13 07:52:47 2010
@@ -59,7 +59,7 @@ public class DefaultAccelUriManagerTest
@Test
public void testParseAndNormalizeNonAccelUri() throws Exception {
Uri uri = Uri.parse("http://www.example.org/index.html");
- assertEquals(Uri.parse("http://apache.org/gadgets/accel?container=default"
+ assertEquals(Uri.parse("//apache.org/gadgets/accel?container=default"
+ "&gadget=http%3A%2F%2Fwww.example.org%2Findex.html"
+ "&debug=0&nocache=0&refresh=0"
+ "&url=http%3A%2F%2Fwww.example.org%2Findex.html"),
@@ -71,7 +71,7 @@ public class DefaultAccelUriManagerTest
Uri uri = Uri.parse("http://apache.org/gadgets/accel?container=proxy"
+ "&gadget=http%3A%2F%2Fwww.1.com%2Fa.html"
+ "&url=http%3A%2F%2Fwww.example.org%2Findex.html");
- assertEquals(Uri.parse("http://apache.org/gadgets/accel?container=proxy"
+ assertEquals(Uri.parse("//apache.org/gadgets/accel?container=proxy"
+ "&gadget=http%3A%2F%2Fwww.1.com%2Fa.html"
+ "&debug=0&nocache=0&refresh=0"
+ "&url=http%3A%2F%2Fwww.example.org%2Findex.html"),