svn commit: r760839 - in /lenya/contributions/2_0_X/modules/atom: jx/entry.jx test/canoo/test.xml

Author: andreas
Date: Wed Apr  1 10:14:23 2009
New Revision: 760839

URL: http://svn.apache.org/viewvc?rev=760839&view=rev
Log:
Fixing atom test, use separate page context for Firedocs.

Modified:
    lenya/contributions/2_0_X/modules/atom/jx/entry.jx
    lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml

Modified: lenya/contributions/2_0_X/modules/atom/jx/entry.jx
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/atom/jx/entry.jx?rev=760839&r1=760838&r2=760839&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/atom/jx/entry.jx (original)
+++ lenya/contributions/2_0_X/modules/atom/jx/entry.jx Wed Apr  1 10:14:23 2009
@@ -42,7 +42,7 @@
           <edit:parameter name="editor" value="firedocs"/>
         </edit:style>
       </edit:styles>
-      <edit:page-context href="${docUrl}#content"/>
+      <edit:page-context href="${docUrl}.pageContext"/>
       <edit:inserts href="${docUrl}?lenya.usecase=atom.inserts"/>
       <edit:schema type="relaxNG" href="${view.getSchemaUri()}"/>
       <edit:uri-resolver protocol="lenya-document"

Modified: lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml?rev=760839&r1=760838&r2=760839&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml (original)
+++ lenya/contributions/2_0_X/modules/atom/test/canoo/test.xml Wed Apr  1 10:14:23 2009
@@ -46,7 +46,7 @@
   <property name="sessionId" value=""/>
   
   <property name="pubId" value="defaultfiredocs"/>
-  <property name="pubTitle" value="Default with Firedocs"/>
+  <property name="pubName" value="Default with Firedocs"/>
   <property name="prefix" value="/${pubId}/authoring"/>
   <property name="documentUrl" value="${prefix}/concepts.html"/>
   
@@ -221,7 +221,7 @@
         <option name="ThrowExceptionOnFailingStatusCode" value="false"/>
       </config>
       <steps>
-        <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
+        <doLogin username="lenya" password="levi" url="${documentUrl}" pubName="${pubName}"/>
 
         <!-- ====================================================================== -->
         <!-- check workspace service document -->
@@ -265,7 +265,7 @@
         <option name="ThrowExceptionOnFailingStatusCode" value="false"/>
       </config>
       <steps>
-        <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
+        <doLogin username="lenya" password="levi" url="${documentUrl}" pubName="${pubName}"/>
         
         <!-- ====================================================================== -->
         <!-- clean up previous changes -->
@@ -316,7 +316,7 @@
         <option name="ThrowExceptionOnFailingStatusCode" value="false"/>
       </config>
       <steps>
-        <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
+        <doLogin username="lenya" password="levi" url="${documentUrl}" pubName="${pubName}"/>
         
         <invoke url="${entryUrl}" method="PUT" contentFile="${entryFile}" contentType="application/atom+xml"/>
         <verifyResponseCode code="200"/>
@@ -342,7 +342,7 @@
       </config>
       
       <steps>
-        <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
+        <doLogin username="lenya" password="levi" url="${documentUrl}" pubName="${pubName}"/>
 
         <!-- ====================================================================== -->
         <!-- remove existing lock -->
@@ -396,7 +396,7 @@
         
         <doLogout/>
         
-        <doLogin username="alice" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
+        <doLogin username="alice" password="levi" url="${documentUrl}" pubName="${pubName}"/>
         
         <!-- ====================================================================== -->
         <!-- can't create lock if already locked by a different user -->
@@ -437,7 +437,7 @@
         <option name="ThrowExceptionOnFailingStatusCode" value="false"/>
       </config>
       <steps>
-        <doLogin username="lenya" password="levi" url="${documentUrl}" pubTitle="${pubTitle}"/>
+        <doLogin username="lenya" password="levi" url="${documentUrl}" pubName="${pubName}"/>
         
         <!-- ====================================================================== -->
         <!-- delete asset -->