rhosync 2.0.7 → 2.0.8

data/CHANGELOG

@@ -1,5 +1,11 @@
+## 2.0.8
+* #5185540 - don't try to load licensefile if env var exists
+* #5246936 - changed settings.yml-belongs_to format to use array instead of hash
+* #5578580 - allow Store.db to accept an existing redis object (useful for overriding redis settings)
+
 ## 2.0.7
 * #4893692 - fixed infinite search loop
+* search properly handles multiple page results
 
 ## 2.0.6
 * #4701421 - dbfile url has junk characters

data/Rakefile

@@ -18,6 +18,7 @@ begin
     :api    => 'spec/api/*_spec.rb',
     :bulk   => 'spec/bulk_data/*_spec.rb',
     :jobs   => 'spec/jobs/*_spec.rb',
+    :monitoring => 'spec/monitoring/*_spec.rb',
     :ping   => 'spec/ping/*_spec.rb',
     :doc    => 'spec/doc/*_spec.rb', 
     :generator => 'spec/generator/*_spec.rb',

data/doc/protocol.html

@@ -134,10 +134,10 @@
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -209,10 +209,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT
+rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT
+rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT
+rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0AaWNhdGlvbg%3D%3D%0A--b8bda815ee9066b6d6589a39a9c1700edba590ca; path=/; expires=Sat, 08-Oct-2011 17:55:17 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -280,14 +280,14 @@ rhosync_session=BAh7CDoKbG9naW4wOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9uYW1lIhBhcHBs%0Aa
     </tr>
     <tr>
       <td style='text-align: left;'>Content-Length</td>
-      <td style='text-align: left;'>499</td>
+      <td style='text-align: left;'>501</td>
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -299,7 +299,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":{"brand":"SampleAdapter"}},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}},"client":{"client_id":"4b6ea70bbee94ceda1252b0b968ceea1"}}</td>
+      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":[{"brand":"SampleAdapter"}]},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}},"client":{"client_id":"60f42f230af74632a2c1ffa072e713cf"}}</td>
     </tr>
   </tbody>
 </table>
@@ -355,14 +355,14 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Content-Length</td>
-      <td style='text-align: left;'>499</td>
+      <td style='text-align: left;'>501</td>
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -374,7 +374,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":{"brand":"SampleAdapter"}},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}},"client":{"client_id":"f6c76b4479d542ef89ace7f38b035e61"}}</td>
+      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":[{"brand":"SampleAdapter"}]},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}},"client":{"client_id":"0adadd2db5a74b00960d831ac46cbb4c"}}</td>
     </tr>
   </tbody>
 </table>
@@ -411,7 +411,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td>{"device_port":"3333","device_pin":"abcd","device_type":"iPhone","client_id":"358f395daa7f40f0ab18e833bd764cb5"}</td>
+      <td>{"device_port":"3333","device_pin":"abcd","device_type":"iPhone","client_id":"8107ce05b18a475d87650947536805ab"}</td>
     </tr>
   </tbody>
 </table>
@@ -430,14 +430,14 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Content-Length</td>
-      <td style='text-align: left;'>441</td>
+      <td style='text-align: left;'>443</td>
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -449,13 +449,13 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":{"brand":"SampleAdapter"}},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}}}</td>
+      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":[{"brand":"SampleAdapter"}]},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}}}</td>
     </tr>
   </tbody>
 </table>
 <h2 id='6'>6. clientreset - reset client database</h2>
 
-<h3>Request: GET /application/clientreset?client_id=1dbe2ffac1674cfbb5ac8fb0acfbf3a4</h3>
+<h3>Request: GET /application/clientreset?client_id=fe94bc497b9046ee98defb768c65f9c0</h3>
 <table>
   <thead>
     <tr>
@@ -505,14 +505,14 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Content-Length</td>
-      <td style='text-align: left;'>441</td>
+      <td style='text-align: left;'>443</td>
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:03 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -524,7 +524,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":{"brand":"SampleAdapter"}},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}}}</td>
+      <td style='text-align: left;'>{"sources":{"FixedSchemaAdapter":{"schema":{"property":{"image_url_cropped":"blob,overwrite","price":"string","brand":"string","name":"string","image_url":"blob"},"unique_index":{"by_price":"price"},"version":"1.0","index":{"by_name_brand":"name,brand"}},"poll_interval":300,"sync_type":"incremental","belongs_to":[{"brand":"SampleAdapter"}]},"SampleAdapter":{"poll_interval":300},"SimpleAdapter":{"partition_type":"app","poll_interval":600}}}</td>
     </tr>
   </tbody>
 </table>
@@ -561,7 +561,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td>{"client_id":"c9006ef04db34224ba82cc98eb51aa88","create":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"source_name":"SampleAdapter"}</td>
+      <td>{"client_id":"846fa332468347c2b6d849f95bd4af9f","create":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"source_name":"SampleAdapter"}</td>
     </tr>
   </tbody>
 </table>
@@ -584,10 +584,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -636,7 +636,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td>{"client_id":"28a122825fb84974b71c733c5c200475","update":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"source_name":"SampleAdapter"}</td>
+      <td>{"client_id":"38cfd75cf66d4a8d8192b90890acc83c","update":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"source_name":"SampleAdapter"}</td>
     </tr>
   </tbody>
 </table>
@@ -659,10 +659,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -711,7 +711,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td>{"delete":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"client_id":"98b23a9313d64d258ec2051831a77cbe","source_name":"SampleAdapter"}</td>
+      <td>{"delete":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"client_id":"ad7c0556f0b240ba828f98aee2b8db19","source_name":"SampleAdapter"}</td>
     </tr>
   </tbody>
 </table>
@@ -734,10 +734,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:18 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -877,7 +877,7 @@ Content-Disposition: form-data; name="cud"
   </thead>
   <tbody>
     <tr>
-      <td>{"delete":{"3":{"price":"299.99","brand":"HTC","name":"Fuze"}},"client_id":"71489989347848ef94718ba6622f316c","create":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"update":{"2":{"price":"99.99","brand":"Android","name":"G2"}},"source_name":"SampleAdapter"}</td>
+      <td>{"delete":{"3":{"price":"299.99","brand":"HTC","name":"Fuze"}},"client_id":"e0d2fa170f5049e592b22b704718cba3","create":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"}},"update":{"2":{"price":"99.99","brand":"Android","name":"G2"}},"source_name":"SampleAdapter"}</td>
     </tr>
   </tbody>
 </table>
@@ -900,10 +900,10 @@ Content-Disposition: form-data; name="cud"
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -921,7 +921,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
 </table>
 <h2 id='12'>12. create-with-link - send link for created object</h2>
 
-<h3>Request: GET /application?version=3&client_id=d136e1b465824cc39d8cf452943bd8ec&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=abec3b318c4e44dfb6f7ed16b70ebb86&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -975,10 +975,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -990,13 +990,13 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[{"version":3},{"token":"53607784832566"},{"count":1},{"progress_count":0},{"total_count":0},{"delete":{"backend_id":{"price":"249.99","brand":"Android","name":"Droid","link":"test link"}},"links":{"4":{"l":"backend_id"}}}]</td>
+      <td style='text-align: left;'>[{"version":3},{"token":"55763719265453"},{"count":1},{"progress_count":0},{"total_count":0},{"delete":{"backend_id":{"price":"249.99","brand":"Android","name":"Droid","link":"test link"}},"links":{"4":{"l":"backend_id"}}}]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='13'>13. query-error - send query error</h2>
 
-<h3>Request: GET /application?version=3&client_id=4f5b5ae51db049509d65deb31c11762d&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=874ae728d1e845e8957edba7a5c81ba4&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1050,10 +1050,10 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:04 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1071,7 +1071,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
 </table>
 <h2 id='14'>14. login-error - send login error</h2>
 
-<h3>Request: GET /application?version=3&client_id=ee5031b7d3ea4cd99f882326357de386&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=7cc82cae11604d1c89e35d28ba04e1d0&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1125,10 +1125,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1146,7 +1146,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
 </table>
 <h2 id='15'>15. logoff-error - send logoff error</h2>
 
-<h3>Request: GET /application?version=3&client_id=a39eb798dc0d455a810d688306f602b0&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=316be66001d44fd0b805ccee89eb4e10&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1200,10 +1200,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1215,13 +1215,13 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[{"version":3},{"token":"53607785303508"},{"count":1},{"progress_count":0},{"total_count":1},{"source-error":{"logoff-error":{"message":"Error logging off"}},"insert":{"0_broken_object_id":{"name":"logoff error","an_attribute":"Error logging off"}}}]</td>
+      <td style='text-align: left;'>[{"version":3},{"token":"55763719745428"},{"count":1},{"progress_count":0},{"total_count":1},{"source-error":{"logoff-error":{"message":"Error logging off"}},"insert":{"0_broken_object_id":{"name":"logoff error","an_attribute":"Error logging off"}}}]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='16'>16. create-error - send create error</h2>
 
-<h3>Request: GET /application?version=3&client_id=7c78b1a8af0b47fcb4d5988e361e5908&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=00145cb0690643eb8f4c30d0c0b766dc&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1275,10 +1275,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:19 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1296,7 +1296,7 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
 </table>
 <h2 id='17'>17. update-error - send update error</h2>
 
-<h3>Request: GET /application?version=3&client_id=6c0ca8da8bbf410391c4440b24cfcaf5&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=c4ccc18a5abd40268c3fff6fca6fc669&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1350,10 +1350,10 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1371,7 +1371,7 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
 </table>
 <h2 id='18'>18. delete-error - send delete error</h2>
 
-<h3>Request: GET /application?version=3&client_id=81802328ae5545e98f4a4fee2e77c0a9&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=4a85766dfe2242a9806c2ffff723d127&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1425,10 +1425,10 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1446,7 +1446,7 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
 </table>
 <h2 id='19'>19. insert objects - send insert objects</h2>
 
-<h3>Request: GET /application?version=3&client_id=05e25503b1f947cebf233c0a64cd88de&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=91bc6aa0056d4333ba3550be535d837d&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1500,10 +1500,10 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:05 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1515,13 +1515,13 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[{"version":3},{"token":"53607785968616"},{"count":2},{"progress_count":0},{"total_count":2},{"insert":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"},"2":{"brand":"Android","price":"99.99","name":"G2"}}}]</td>
+      <td style='text-align: left;'>[{"version":3},{"token":"55763720428963"},{"count":2},{"progress_count":0},{"total_count":2},{"insert":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"},"2":{"brand":"Android","price":"99.99","name":"G2"}}}]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='20'>20. metadata - send metadata</h2>
 
-<h3>Request: GET /application?version=3&client_id=aea861a3666e4f98ade06be4029e2ba0&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&client_id=058bfdbf35df45d2b34aeb505ab8cc6c&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1575,10 +1575,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1590,13 +1590,13 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[{"version":3},{"token":"53607786130902"},{"count":3},{"progress_count":0},{"total_count":3},{"metadata":"{\"foo\":\"bar\"}","insert":{"1":{"name":"iPhone","brand":"Apple","price":"199.99"},"2":{"name":"G2","brand":"Android","price":"99.99"},"3":{"name":"Fuze","price":"299.99","brand":"HTC"}}}]</td>
+      <td style='text-align: left;'>[{"version":3},{"token":"55763720594407"},{"count":3},{"progress_count":0},{"total_count":3},{"metadata":"{\"foo\":\"bar\"}","insert":{"1":{"name":"iPhone","brand":"Apple","price":"199.99"},"2":{"name":"G2","brand":"Android","price":"99.99"},"3":{"name":"Fuze","price":"299.99","brand":"HTC"}}}]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='21'>21. delete objects - send delete objects</h2>
 
-<h3>Request: GET /application?version=3&token=53607786291194&client_id=a3746ae6fa394b97bfee1e0f2d1f1e18&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&token=55763720758472&client_id=7fa42413bf28472cad8a89f199e71da5&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1650,10 +1650,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:20 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1665,13 +1665,13 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[{"version":3},{"token":"53607786376892"},{"count":2},{"progress_count":0},{"total_count":0},{"delete":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"},"2":{"name":"G2","price":"99.99","brand":"Android"}}}]</td>
+      <td style='text-align: left;'>[{"version":3},{"token":"55763720844809"},{"count":2},{"progress_count":0},{"total_count":0},{"delete":{"1":{"price":"199.99","brand":"Apple","name":"iPhone"},"2":{"name":"G2","price":"99.99","brand":"Android"}}}]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='22'>22. insert-delete objects - send insert and delete objects</h2>
 
-<h3>Request: GET /application?version=3&token=53607786535653&client_id=94c200b13d6f4fb78ab7a5badee7a955&source_name=SampleAdapter</h3>
+<h3>Request: GET /application?version=3&token=55763721007384&client_id=80a1e76c205a418486db159c43135561&source_name=SampleAdapter</h3>
 <table>
   <thead>
     <tr>
@@ -1725,10 +1725,10 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--f3dee010e07afee08de30a7f6d2a7afc3b28ca73; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1740,13 +1740,13 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[{"version":3},{"token":"53607786560457"},{"count":2},{"progress_count":1},{"total_count":2},{"delete":{"2":{"name":"G2","brand":"Android","price":"99.99"}},"insert":{"3":{"name":"Fuze","price":"299.99","brand":"HTC"}}}]</td>
+      <td style='text-align: left;'>[{"version":3},{"token":"55763721031977"},{"count":2},{"progress_count":1},{"total_count":2},{"delete":{"2":{"name":"G2","brand":"Android","price":"99.99"}},"insert":{"3":{"name":"Fuze","price":"299.99","brand":"HTC"}}}]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='23'>23. search result - send search results</h2>
 
-<h3>Request: GET /application/search?search[name]=iPhone&version=3&client_id=e02d4afa23214c33a1235d9a52bce9e0&sources[][name]=SampleAdapter</h3>
+<h3>Request: GET /application/search?search[name]=iPhone&version=3&sources[][name]=SampleAdapter&client_id=baef6bdf0d544b749bc271cd43e0672f</h3>
 <table>
   <thead>
     <tr>
@@ -1800,10 +1800,10 @@ rhosync_session=BAh7CDoJYXV0aCIOZGVsZWdhdGVkOgpsb2dpbiINdGVzdHVzZXI6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1815,13 +1815,13 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[[{"version":3},{"token":"53607786708522"},{"source":"SampleAdapter"},{"count":1},{"insert":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}]]</td>
+      <td style='text-align: left;'>[[{"version":3},{"token":"55763721183672"},{"source":"SampleAdapter"},{"count":1},{"insert":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}]]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='24'>24. search error - send search error</h2>
 
-<h3>Request: GET /application/search?search[name]=iPhone&version=3&client_id=861dada3033d4beaa590d590b8c6443d&sources[][name]=SampleAdapter</h3>
+<h3>Request: GET /application/search?search[name]=iPhone&version=3&sources[][name]=SampleAdapter&client_id=bd25541d690342da9b7365cc2f1e2d6a</h3>
 <table>
   <thead>
     <tr>
@@ -1875,10 +1875,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1896,7 +1896,7 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
 </table>
 <h2 id='25'>25. multi source search - send multiple sources in search results</h2>
 
-<h3>Request: GET /application/search?search[search]=bar&version=3&client_id=71f4d11fc2a7478e9f3b895f2d90160d&sources[][name]=SimpleAdapter&sources[][name]=SampleAdapter</h3>
+<h3>Request: GET /application/search?search[search]=bar&version=3&sources[][name]=SimpleAdapter&sources[][name]=SampleAdapter&client_id=24808f7439584583b4abaa1c8dceff96</h3>
 <table>
   <thead>
     <tr>
@@ -1950,10 +1950,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:06 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT</td>
     </tr>
   </tbody>
 </table>
@@ -1965,13 +1965,13 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
   </thead>
   <tbody>
     <tr>
-      <td style='text-align: left;'>[[{"version":3},{"token":"53607786955306"},{"source":"SimpleAdapter"},{"count":1},{"insert":{"obj":{"foo":"bar"}}}],[{"version":3},{"token":"53607786963113"},{"source":"SampleAdapter"},{"count":1},{"insert":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}]]</td>
+      <td style='text-align: left;'>[[{"version":3},{"token":"55763721433644"},{"source":"SimpleAdapter"},{"count":1},{"insert":{"obj":{"foo":"bar"}}}],[{"version":3},{"token":"55763721441500"},{"source":"SampleAdapter"},{"count":1},{"insert":{"1":{"brand":"Apple","name":"iPhone","price":"199.99"}}}]]</td>
     </tr>
   </tbody>
 </table>
 <h2 id='26'>26. multi source search ack - acknowledge search result on multiple sources</h2>
 
-<h3>Request: GET /application/search?version=3&client_id=890a0f0278584fb7b0192c35c2bba962&sources[][name]=SimpleAdapter&sources[][token]=53607787116282&sources[][name]=SampleAdapter&sources[][token]=53607787123473</h3>
+<h3>Request: GET /application/search?version=3&sources[][name]=SimpleAdapter&sources[][token]=55763721597080&sources[][name]=SampleAdapter&sources[][token]=55763721604628&client_id=89d855531f6f48f49c01559d838fa0ea</h3>
 <table>
   <thead>
     <tr>
@@ -2025,10 +2025,10 @@ rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AY
     </tr>
     <tr>
       <td style='text-align: left;'>Set-Cookie</td>
-      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:07 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:07 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:07 GMT
-rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Tue, 13-Sep-2011 19:03:07 GMT</td>
+      <td style='text-align: left;'>rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT
+rhosync_session=BAh7CDoKbG9naW4iDXRlc3R1c2VyOglhdXRoIg5kZWxlZ2F0ZWQ6DWFwcF9u%0AYW1lIhBhcHBsaWNhdGlvbg%3D%3D%0A--20e7eced1d218d3d793295c9fd16835224570e24; path=/; expires=Sat, 08-Oct-2011 17:55:21 GMT</td>
     </tr>
   </tbody>
 </table>

data/lib/rhosync/bulk_data/syncdb.index.schema

@@ -1,3 +1,4 @@
-CREATE INDEX by_src_id on object_values (source_id);
-CREATE UNIQUE INDEX by_src_object ON object_values (object, attrib, source_id);
-CREATE INDEX by_src_value ON object_values (attrib, source_id, value);
+CREATE INDEX by_src_id on object_values ("source_id");
+CREATE UNIQUE INDEX by_src_object ON object_values ("object", "attrib", "source_id");
+CREATE INDEX by_src_value ON object_values ("attrib", "source_id", "value");
+

data/lib/rhosync/bulk_data/syncdb.schema

@@ -1,40 +1,41 @@
 CREATE TABLE client_info (
- client_id VARCHAR(255) default NULL,
- session VARCHAR(255) default NULL,
- token VARCHAR(255) default NULL,
- token_sent BIGINT default 0,
- reset BIGINT default 0,
- port VARCHAR(10) default NULL,
- last_sync_success VARCHAR(100) default NULL);
+ "client_id" VARCHAR(255) default NULL,
+ "session" VARCHAR(255) default NULL,
+ "token" VARCHAR(255) default NULL,
+ "token_sent" BIGINT default 0,
+ "reset" BIGINT default 0,
+ "port" VARCHAR(10) default NULL,
+ "last_sync_success" VARCHAR(100) default NULL);
 CREATE TABLE object_values (
- source_id BIGINT default NULL,
- attrib varchar(255) default NULL,
- object varchar(255) default NULL,
- value varchar default NULL);
+ "source_id" BIGINT default NULL,
+ "attrib" varchar(255) default NULL,
+ "object" varchar(255) default NULL,
+ "value" varchar default NULL);
 CREATE TABLE changed_values (
- source_id BIGINT default NULL,
- attrib varchar(255) default NULL,
- object varchar(255) default NULL,
- value varchar default NULL,
- attrib_type varchar(255) default NULL,
- update_type varchar(255) default NULL,
- sent BIGINT default 0);
+ "source_id" BIGINT default NULL,
+ "attrib" varchar(255) default NULL,
+ "object" varchar(255) default NULL,
+ "value" varchar default NULL,
+ "attrib_type" varchar(255) default NULL,
+ "update_type" varchar(255) default NULL,
+ "sent" BIGINT default 0);
 CREATE TABLE sources (
- source_id BIGINT PRIMARY KEY,
- name VARCHAR(255) default NULL,
- token BIGINT default NULL,
- sync_priority BIGINT,
- partition VARCHAR(255),
- sync_type VARCHAR(255),
- metadata varchar default NULL, 
- last_updated BIGINT default 0,
- last_inserted_size BIGINT default 0,
- last_deleted_size BIGINT default 0,
- last_sync_duration BIGINT default 0,
- last_sync_success BIGINT default 0,
- backend_refresh_time BIGINT default 0,
- source_attribs varchar default NULL,
- schema varchar default NULL,
- schema_version varchar default NULL,
- associations varchar default NULL,
- blob_attribs varchar default NULL);
+ "source_id" BIGINT PRIMARY KEY,
+ "name" VARCHAR(255) default NULL,
+ "token" BIGINT default NULL,
+ "sync_priority" BIGINT,
+ "partition" VARCHAR(255),
+ "sync_type" VARCHAR(255),
+ "metadata" varchar default NULL, 
+ "last_updated" BIGINT default 0,
+ "last_inserted_size" BIGINT default 0,
+ "last_deleted_size" BIGINT default 0,
+ "last_sync_duration" BIGINT default 0,
+ "last_sync_success" BIGINT default 0,
+ "backend_refresh_time" BIGINT default 0,
+ "source_attribs" varchar default NULL,
+ "schema" varchar default NULL,
+ "schema_version" varchar default NULL,
+ "associations" varchar default NULL,
+ "blob_attribs" varchar default NULL);
+

data/lib/rhosync/license.rb

@@ -14,10 +14,10 @@ module Rhosync
 
     def initialize
       begin
-        settings = Rhosync.get_config(Rhosync.base_directory)[Rhosync.environment]
         if ENV['RHOSYNC_LICENSE']
           @license = ENV['RHOSYNC_LICENSE']
         else
+          settings = Rhosync.get_config(Rhosync.base_directory)[Rhosync.environment]
           @license = IO.read(File.join(Rhosync.base_directory,settings[:licensefile])).strip
         end
         _decrypt

data/lib/rhosync/monitoring/record.rb

@@ -0,0 +1,28 @@
+module Rhosync
+  module Monitoring
+    class Record
+      class << self
+        
+        def add(metric, value = 1)
+          # TODO: add record to metric, trim zset size if necessary
+        end
+        
+        def set(metric, value)
+          # TODO: set absolute value
+        end
+      
+        def range(metric, start, finish = Time.now.to_i)
+          # TODO: returns range of records based on start, finish
+        end
+        
+        def resolution
+          Object.const_get("#{metric.upper}_RECORD_RESOLUTION") || 60 #=> 1 minute aggregate
+        end
+        
+        def record_size
+          Object.const_get("#{metric.upper}_RECORD_SIZE") || 60 * 24 * 31 #=> 44640 minutes
+        end
+      end
+    end
+  end
+end

data/lib/rhosync/source.rb

@@ -54,10 +54,16 @@ module Rhosync
         s = Source.load(source, params)
         if s.belongs_to
           belongs_to = JSON.parse(s.belongs_to)
-          belongs_to.each do |attrib,model|
-            owner = Source.load(model, params)
-            owner.has_many = owner.has_many.length > 0 ? owner.has_many+',' : ''
-            owner.has_many += [source,attrib].join(',')
+          if belongs_to.is_a?(Array)
+            belongs_to.each do |entry|
+              attrib = entry.keys[0]
+              model = entry[attrib]
+              owner = Source.load(model, params)
+              owner.has_many = owner.has_many.length > 0 ? owner.has_many+',' : ''
+              owner.has_many += [source,attrib].join(',')
+            end
+          else
+            log "WARNING: Incorrect belongs_to format for #{source}, belongs_to should be an array."
           end
         end
       end

data/lib/rhosync/store.rb

@@ -187,6 +187,8 @@ module Rhosync
           host,port,db,password = server.split(':')
           Redis.new(:thread_safe => true, :host => host,
             :port => port, :db => db, :password => password)
+        elsif server and server.is_a?(Redis)
+          server
         else
           Redis.new(:thread_safe => true)
         end

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

data/lib/rhosync.rb

@@ -21,6 +21,7 @@ require 'rhosync/source_sync'
 require 'rhosync/rho_indifferent_access'
 require 'rhosync/jobs/source_job'
 require 'rhosync/jobs/ping_job'
+require 'rhosync/monitoring/record'
 require 'rhosync/bulk_data'
 
 REDIS_URL = 'REDIS' unless defined? REDIS_URL

data/spec/apps/rhotestapp/settings/settings.yml

@@ -8,7 +8,7 @@
     poll_interval: 300
     sync_type: 'incremental'
     belongs_to: 
-      brand: 'SampleAdapter'
+      - brand: 'SampleAdapter'
     schema:
       version: '1.0'
       property:

data/spec/monitoring/record_spec.rb

@@ -0,0 +1,21 @@
+require 'rhosync'
+
+include Rhosync::Monitoring
+
+describe "Record" do
+  it "should add metric to the record" do
+    pending
+    Record.add('foo')
+    Record.add('foo')
+  end
+  
+  it "should not exceed record size" do
+    pending
+  end
+  
+  it "should set absolute metric value"
+  
+  it "should get range of metric values"
+  
+  it "should reset metric"
+end

data/spec/server/server_spec.rb

@@ -131,7 +131,7 @@ describe "Server" do
              "index"=>{"by_name_brand"=>"name,brand"}},
            "poll_interval"=>300,
            "sync_type"=>"incremental",
-           "belongs_to"=>{"brand"=>"SampleAdapter"}},
+           "belongs_to"=>[{"brand"=>"SampleAdapter"}]},
          "SampleAdapter"=>{"poll_interval"=>300},
          "SimpleAdapter"=>{"partition_type"=>"app", "poll_interval"=>600}}
       }

data/spec/source_spec.rb

@@ -76,8 +76,19 @@ describe "Source" do
   end
   
   it "should add associations based on belongs_to field for a source" do
-    Source.update_associations([@s.name,@s1.name])
+    @s2 = Source.create({:name => 'SimpleAdapter'}, @s_params)
+    @s2.belongs_to = [{'product_id' => 'SampleAdapter'}].to_json
+    Source.update_associations([@s.name,@s1.name, @s2.name])
     s = Source.load(@s.name,{:app_id => @a.id,:user_id => '*'})
-    s.has_many.should == "#{@s1.name},brand"
+    s.has_many.should == "#{@s1.name},brand,#{@s2.name},product_id"
+  end
+  
+  it "should log warning about incorrect belongs_to format for a source" do
+    @s2 = Source.create({:name => 'SimpleAdapter'}, @s_params)
+    @s2.belongs_to = {'product_id' => 'SampleAdapter'}.to_json
+    Source.should_receive(:log).once.with(
+      "WARNING: Incorrect belongs_to format for SimpleAdapter, belongs_to should be an array."
+    )
+    Source.update_associations([@s.name,@s1.name, @s2.name])
   end
 end

data/spec/store_spec.rb

@@ -22,6 +22,11 @@ describe "Store" do
       Store.db.class.name.should match(/Redis/)
     end
     
+    it "should assign redis to existing redis" do
+      Store.db = Redis.new(:timeout => 60)
+      Store.db.client.timeout.should == 60
+    end
+    
     it "should create redis connection based on ENV" do
       ENV[REDIS_URL] = 'redis://localhost:6379'
       Redis.should_receive(:connect).with(:url => 'redis://localhost:6379').and_return { Redis.new }

data/tasks/redis.rake

@@ -144,7 +144,7 @@ namespace :redis do
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout v1.3.12"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout v2.0.2-stable"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -414,6 +414,7 @@ files:
 - lib/rhosync/license.rb
 - lib/rhosync/lock_ops.rb
 - lib/rhosync/model.rb
+- lib/rhosync/monitoring/record.rb
 - lib/rhosync/ping.rb
 - lib/rhosync/ping/apple.rb
 - lib/rhosync/ping/blackberry.rb
@@ -483,6 +484,7 @@ files:
 - spec/jobs/source_job_spec.rb
 - spec/license_spec.rb
 - spec/model_spec.rb
+- spec/monitoring/record_spec.rb
 - spec/perf/bulk_data_perf_spec.rb
 - spec/perf/perf_spec_helper.rb
 - spec/perf/store_perf_spec.rb
@@ -588,6 +590,7 @@ test_files:
 - spec/jobs/source_job_spec.rb
 - spec/license_spec.rb
 - spec/model_spec.rb
+- spec/monitoring/record_spec.rb
 - spec/perf/bulk_data_perf_spec.rb
 - spec/perf/perf_spec_helper.rb
 - spec/perf/store_perf_spec.rb