You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2009/12/17 01:48:31 UTC

svn commit: r891496 [2/2] - in /incubator/shindig/trunk: ./ features/src/main/javascript/features/caja/ java/gadgets/ java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/ java/ga...

Added: incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html?rev=891496&view=auto
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html (added)
+++ incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test-with-specialtags.html Thu Dec 17 00:48:29 2009
@@ -0,0 +1,61 @@
+<html>
+<head>
+  <title>An example</title>
+</head>
+<body>
+<style type="text/css">
+  <!--
+  #mymap #header {
+    background: #FF9700;
+    clear: both;
+    padding: 2px 0 1px;
+    position: relative;
+    width: 640px;
+  }
+
+  -->
+</style>
+<script type="text/javascript">document.write("&&&")</script>
+<script src="http://www.example.org/1.js" type="text/javascript"></script>
+<script>
+  // scripts with no old comment hack should be preserved.
+  function a1() {
+    var v1 = 0;
+    alert(" this whitespace should be preserved.");
+  }
+</script>
+<div>
+  <table>
+    <tr>
+      <td>a cell</td>
+    </tr>
+  </table>
+</div>
+<script type="text/javascript">
+  <!--
+  // script with old comment hack should be preserved.
+  function MM_goToURL() {
+    var i, args = MM_goToURL.arguments;
+    document.MM_returnValue = false;
+    for (i = 0; i < (args.length - 1); i += 2) eval(args[i] + ".location='" + args[i + 1] + "'");
+  }
+  //-->
+</script>
+<p>Lorem ipsum</p>
+<a href="/test.html" title="">link</a>
+ <pre>
+ This is a preformatted block of text,
+ and whitespaces should be preserved.
+ </pre>
+<form action="/test/submit">
+  <div>
+    <input type="hidden" value="something">
+    <input type="text"/>
+    <textarea>
+      This is a preformatted block of text,
+      and whitespaces should be preserved too.
+    </textarea>
+  </div>
+</form>
+</body>
+</html>
\ No newline at end of file

Added: incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html?rev=891496&view=auto
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html (added)
+++ incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/test.html Thu Dec 17 00:48:29 2009
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head id="head">
+  <link href="http://www.example.org/css.css" rel="stylesheet" type="text/css">
+  <title>An example</title>
+</head>
+<body>
+  <!-- Some comment -->
+    <script type="text/javascript">document.write("&&&")</script>
+    <script src="http://www.example.org/1.js" type="text/javascript"></script>
+    <div>
+      <table><tr><td>a cell</td></tr></table>
+    </div>
+    <p>Lorem ipsum</p>
+    <a href="/test.html" title="">link</a>
+    <form action="/test/submit">
+      <div>
+        <input type="hidden" value="something">
+        <input type="text"/>
+      </div>
+      <div><-- An unbalanced tag we dont care about -->
+      <p>Some entities &amp;#x27;&quot;</p>
+      <p>Not a real entity &fake;</p>
+    </form>
+</body>
+</html>
\ No newline at end of file

Modified: incubator/shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=891496&r1=891495&r2=891496&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Thu Dec 17 00:48:29 2009
@@ -1205,6 +1205,10 @@
       </snapshots>
     </repository>
     <repository>
+      <id>diff_match_patch</id>
+      <url>http://google-diff-match-patch.googlecode.com/svn/trunk/maven</url>
+    </repository>
+    <repository>
       <id>caja</id>
       <url>http://google-caja.googlecode.com/svn/maven</url>
     </repository>
@@ -1335,7 +1339,7 @@
       <dependency>
         <groupId>caja</groupId>
         <artifactId>caja</artifactId>
-        <version>RELEASE</version>
+        <version>r3889</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -1384,6 +1388,12 @@
         <version>3.2.1</version>
       </dependency>
       <dependency>
+        <groupId>diff_match_patch</groupId>
+        <artifactId>diff_match_patch</artifactId>
+        <version>current</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
         <version>6.1.15</version>