svn commit: r888500 - in /incubator/chemistry/trunk/chemistry: chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/ chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/

[fguillaume]

Author: fguillaume
Date: Tue Dec  8 18:13:19 2009
New Revision: 888500

URL: http://svn.apache.org/viewvc?rev=888500&view=rev
Log:
CMIS-64: generate proper AtomPub paging URI

Modified:
    
incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISChildrenCollection.java
    
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/FolderChildrenTest.java

Modified: 
incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISChildrenCollection.java
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISChildrenCollection.java?rev=888500&r1=888499&r2=888500&view=diff
==============================================================================
--- 
incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISChildrenCollection.java
 (original)
+++ 
incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISChildrenCollection.java
 Tue Dec  8 18:13:19 2009
@@ -108,7 +108,7 @@
                     0);
             skipCount += entries.size();
             // compute new URI
-            String uri = request.getUri().toString();
+            String uri = request.getResolvedUri().toString();
             Pattern pat = Pattern.compile("(.*[?&]"
                     + AtomPubCMIS.PARAM_SKIP_COUNT + "=)(-?[0-9]+)(.*)");
             Matcher m = pat.matcher(uri);

Modified: 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/FolderChildrenTest.java
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/FolderChildrenTest.java?rev=888500&r1=888499&r2=888500&view=diff
==============================================================================
--- 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/FolderChildrenTest.java
 (original)
+++ 
incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/FolderChildrenTest.java
 Tue Dec  8 18:13:19 2009
@@ -41,7 +41,7 @@
  * CMIS Folder Children Tests
  */
 public class FolderChildrenTest extends TCKTest {
-    
+
     public void testGetChildren() throws Exception {
         EntryTree folder = fixture.createTestTree("children", 1, 3, null, 
null);
 
@@ -72,7 +72,9 @@
         int pageCount = 0;
         while (nextLink != null) {
             pageCount++;
-            Feed children = client.getFeed(nextLink.getHref(), args);
+            IRI nextLinkHref = nextLink.getHref();
+            assertNotNull(nextLinkHref.getHost());
+            Feed children = client.getFeed(nextLinkHref, args);
             Assert.assertNotNull(children);
             Assert.assertEquals(pageCount < 4 ? 4 : 3, 
children.getEntries().size());
 
@@ -130,7 +132,7 @@
         Assert.assertNotNull(objectTypePropDef);
         String objectTypeIdQueryName = objectTypePropDef.getQueryName();
         Assert.assertNotNull(objectTypeIdQueryName);
-        
+
         // get children with object_id only
         Link childrenLink = client.getChildrenLink(folder.entry);
         Map<String, String> args = new HashMap<String, String>();