Граф коммитов

3114 Коммитов

Автор SHA1 Сообщение Дата
Gregory Szorc 5758dc5c47 Bug 836177 - Temporarily merge more JSMs to mitigate compartment overhead; r=rnewman
As with bug 834936, this is meant to be temporary until zones land and
we have decent JSM overhead levels.
2013-01-30 07:07:22 -08:00
Gregory Szorc c47eb8f3a2 Bug 836120 - Reduce memory overhead of Sync when it's not configured; r=rnewman
If Sync is (likely) not configured, the only loaded JS is for the XPCOM
service itself.

The UI code is now smart enough to initialize the Sync service if it
isn't yet loaded. This addresses bug 825728.
2013-01-30 07:05:12 -08:00
Gregory Szorc c1ef78d2ba Bug 836086 - Lazy load Sync's keys.js; r=rnewman 2013-01-29 16:46:22 -08:00
Ehsan Akhgari 565d0479c3 Bug 817477 - Remove support for global private browsing mode; r=jdm,glandium
--HG--
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
2013-01-29 13:12:13 -05:00
Gregory Szorc 95d334535a Bug 834936 - Temporarily load JSMs into fewer compartments; r=rnewman
We concatenate JSMs together so we use less compartments and therefore
less memory. This is intended to be a temporary hack until the overhead
of compartments is less.
2013-01-27 11:26:48 -08:00
Richard Newman 5b8a3228cd Bug 832067 - Discard cached statements in healthreporter. r=gps 2013-01-25 00:39:01 -08:00
Richard Newman 07b6d16e13 Bug 830922 - Include version inside measurement payload. r=gps 2013-01-25 00:32:33 -08:00
Richard Newman a4a11eefa2 Bug 831404 - Add logging to test_policy.js. r=trivial,test-only 2013-01-30 20:07:34 -08:00
Richard Newman b78783892f Bug 836369 - Intermittent test_history_tracker.js | test failed | true == false. r=trivial,test-only 2013-01-30 15:30:53 -08:00
Richard Newman 79b3dbdd93 Bug 834159 - Minor doc bugs in FHR. r=gps 2013-01-24 11:10:18 -08:00
Shih-Chiang Chien eede229339 Bug 752982 - Part 1: Implement captive portal detection service. r=thinker 2012-09-15 11:37:53 +08:00
Gregory Szorc 136c8e3904 Bug 827157 - Part 2: report current session information. r=rnewman
The previous patch regressed this because HealthReporter was talking
directly to storage instead of going through the measurement instance.
2013-01-19 00:31:38 -08:00
Gregory Szorc a5c78091d3 Bug 827157 - Robust and performance sensitive recording of sessions; r=rnewman
We have introduced a new background service that captures session state
in preferences. Firefox Health Report now moves entries from preferences
to its database at payload generation time.

We've also introduced a few random APIs, such as enqueueTransaction()
and the ability for providers to have access to their own pref branch.
2013-01-18 22:35:07 -08:00
Andres Hernandez 3f91b9e564 Bug 739217 - Part 3: services replacement of codebase usage of synchronous isVisited with asynchronous isURIVisited. r=rnewman 2013-01-18 12:01:40 -06:00
Gregory Szorc 9265169115 Bug 828703 - Correct removal of idle-daily observer; r=rnewman 2013-01-15 14:53:34 -08:00
Gregory Szorc d265e9b521 Bug 828149 - Cancel timer during application shutdown. r=rnewman 2013-01-14 18:01:53 -08:00
Gregory Szorc 240a50e00b Bug 828829 - Remove dump() from DataReportingService.js; r=trivial 2013-01-11 23:34:57 -08:00
Mike Connor c6f8294a6c bug 719484 - build about:healthreport, r=dolske
--HG--
extra : rebase_source : 54dac2005640bcf6f0b37c16cfbf04bb11d5def1
2013-01-11 15:31:38 -08:00
Gregory Szorc 57f274b2a8 Bug 828829 - Refactor Health Report policy out of services/healthreport; r=rnewman
--HG--
rename : services/healthreport/HealthReportService.js => services/datareporting/DataReportingService.js
rename : services/healthreport/modules-testing/mocks.jsm => services/datareporting/modules-testing/mocks.jsm
rename : services/healthreport/policy.jsm => services/datareporting/policy.jsm
rename : services/healthreport/tests/xpcshell/test_policy.js => services/datareporting/tests/xpcshell/test_policy.js
extra : rebase_source : cf766bc99ff843f2d31f82b1c4be71313fbc65a8
2013-01-11 13:45:22 -08:00
Gregory Szorc 6ddc34b300 Merge mozilla-central into services-central 2013-01-11 11:07:05 -08:00
Richard Newman e1dccc7a9b Bug 829656 - TEST-UNEXPECTED-FAIL | /builds/slave/talos-slave/test/build/xpcshell/tests/services/common/tests/unit/head_helpers.js | 2 == 1. r=trivial 2013-01-11 10:03:15 -08:00
Mark Banner 4d31a85097 Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
extra : transplant_source : k%8A%F7%25%F3%22h%E5%CEQ%AB%9Ds%CA%B6/%962%86N
2013-01-10 22:02:38 +00:00
Mark Banner b786539327 Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
2013-01-10 22:02:38 +00:00
Richard Newman 103245d3f4 Bug 811490 - Follow-up: convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode. r=trivial 2013-01-09 14:30:09 -08:00
Richard Newman c631a7ef40 Merge m-c to s-c. 2013-01-09 12:48:01 -08:00
Gregory Szorc d6fd1542e9 Bug 828101 - Initialize Firefox Health Report after session restore; r=rnewman 2013-01-09 12:10:31 -08:00
Mike Connor 48c1af301d Bug 809094 - Move data upload choices to Advanced pref pane, add FHR option; r=gavin, gps 2013-01-03 23:45:15 -05:00
Gregory Szorc 03c8e6da33 Bug 827910 - Only include details for "plugin" and "extension" add-ons; r=rnewman 2013-01-08 12:07:27 -08:00
Gregory Szorc a1ed1eebda Bug 827602 - Execute queued operations in FIFO not LIFO; r=rnewman 2013-01-07 16:29:25 -08:00
Alex Keybl 9fc46ad72d Merging in version bump NO BUG 2013-01-07 12:31:33 -08:00
Ed Morley 39182aa000 Bug 812608 - Disable test_metrics_storage.js on all platforms now that more failures are appearing 2013-01-07 16:39:47 +00:00
Ed Morley 2d9efb8990 Bug 812608 - Disable test_metrics_storage.js on Windows too, for permapurple PGO timeouts 2013-01-07 16:19:47 +00:00
Ed Morley 6a39d51ad1 Bug 812608 - Disable test_metrics_storage.js on Linux32 debug for permaorange timeouts 2013-01-07 16:01:36 +00:00
Ed Morley 7d5145ce2c Backout 9e11714fcba2 (bug 809094) for browser-chrome failures on a CLOSED TREE 2013-01-07 10:22:08 +00:00
Gregory Szorc b0c6252223 Bug 808126 - Part 3: Use OS.File.stat() to look for missing directory; r=rnewman 2013-01-07 00:17:19 -08:00
Mike Connor ad5ccbe7a4 bug 809094 - update pref pane to support Firefox Health Report, r=gavin,gps
--HG--
extra : rebase_source : 39ac9f3f0f107de91b17c136d6f06fe475858578
2013-01-03 23:45:15 -05:00
Gregory Szorc 4047752fa8 Bug 808126 - Part 2: Work around bug in OS.File.exists(); r=rnewman 2013-01-06 23:03:42 -08:00
Gregory Szorc b25fe48781 Bug 812608 - Part 4: Serially initialize providers; r=rnewman 2013-01-06 22:46:30 -08:00
Gregory Szorc 2ed3cb15f7 Bug 827187 - Part 2: Fix test bustage; r=rnewman 2013-01-06 21:32:18 -08:00
Gregory Szorc 8655581e0f Bug 827187 - Report default browser flag in Firefox Health Report; r=rnewman 2013-01-06 18:23:16 -08:00
Gregory Szorc 678befd5f8 Bug 812608 - Part 2c: Further improvements to shutdown logic; r=rnewman
Now with tests and more logging!
2013-01-06 16:24:50 -08:00
Gregory Szorc 02e0479d7d Bug 813287 - Move healthreport prefs into greprefs.js; r=rnewman 2013-01-06 16:15:51 -08:00
Gregory Szorc 06e65eccad Bug 808126 - Crash report collection for Firefox Health Report; r=rnewman 2013-01-06 14:47:18 -08:00
Gregory Szorc 2a71ccc127 Bug 824528 - Health report provider for collecting add-on info; r=rnewman 2013-01-06 14:40:40 -08:00
Richard Newman ec15ad7dd0 Bug 812608 - Part 3: further tweaks to profile age fetch. r=trivial 2013-01-06 14:07:34 -08:00
Gregory Szorc 38af7fe6a6 Bug 812608 - Part 2b: More robust shutdown logic; r=rnewman 2013-01-06 13:53:33 -08:00
Gregory Szorc 9274ff8986 Bug 826893 - Health Report provider for application sessions; r=rnewman 2013-01-06 12:24:26 -08:00
Gregory Szorc 3d492fcc1e Bug 826580 - Record application version history in Firefox Health Report; r=rnewman 2013-01-06 12:16:05 -08:00
Gregory Szorc f222a856f9 Bug 812608 - Part 2: Refactor FHR on top of new Metrics APIs; r=rnewman
This also includes a lot of revamped Firefox Health Report features. The
payload format has changed. There is now robust service shutdown logic.
There are more prefs to control behavior. It's almost a rewritten
service.
2013-01-06 12:13:27 -08:00
Gregory Szorc 9a4c5c6720 Bug 812608 - Part 1: Persistent storage backend for metrics data; r=rnewman 2013-01-06 12:13:19 -08:00
Gregory Szorc 739e2663f3 Bug 718066 - Enable Firefox Health Report in browser app; r=mconnor
This can't land in mozilla-central until the UX pieces land.
2013-01-06 12:09:39 -08:00
Gregory Szorc 97aca5f790 Bug 791869 - Remove services/notifications; r=rnewman 2013-01-06 12:04:59 -08:00
Gregory Szorc 2a5ae000e2 Merge mozilla-central into services-central
--HG--
rename : content/html/content/public/nsHTMLCanvasElement.h => content/html/content/public/HTMLCanvasElement.h
rename : content/html/content/src/nsHTMLCanvasElement.cpp => content/html/content/src/HTMLCanvasElement.cpp
2013-01-06 10:06:07 -08:00
Gregory Szorc 1307f4e423 Bug 812608 - Part 0: API to (re)define nsIXULAppInfo from unit tests; r=rnewman 2013-01-05 16:10:38 -08:00
Richard Newman b709251bb2 Bug 826421 - Follow-up: remove unnecessary method. r=trivial 2013-01-04 20:03:46 -08:00
Richard Newman 58affe4efc Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Richard Newman 555f8728ab Bug 826086 - Handle errors in asyncOpen. r=gps 2013-01-02 15:40:03 -08:00
Richard Newman 537115a725 Bug 806494 - Fix resource header copying on internal redirect. r=gps 2013-01-04 22:23:50 -08:00
Richard Newman 3c3dcb655a Bug 826421 - Remove Places onBeforeDeleteURI and onBeforeItemRemoved notifications in Sync. r=mak 2013-01-04 09:45:12 -08:00
Mike Hommey 3f28481862 Bug 824330 - Build services/ during the platform tier and enable services in xulrunner. r=blassey,r=bsmedberg,r=gps 2013-01-04 15:56:20 +01:00
Richard Newman 9326b3d9c6 Bug 696974 - Bookmarks engine: "invalid 'in' operand this._modified" in reconcile. r=gps 2012-12-22 12:44:05 -08:00
Richard Newman 98503a2e1b Bug 699546 - Log more backoff information: X-Weave-Backoff, Retry-After. r=gps 2012-12-22 11:43:56 -08:00
Richard Newman 2e84f032e2 Bug 698087 - Remove Service.updatedURL and associated consts. r=gps 2012-12-22 11:43:50 -08:00
Richard Newman f181d0acd8 Merge m-c to s-c. 2012-12-22 11:32:28 -08:00
Richard Newman b74691db4f Bug 650941 - Use run_next_test in test_resource_ua.js. r=mechanical 2012-12-21 23:22:00 -08:00
Mike Hommey 165c251332 Backout changeset 6656cdc8b20d (bug 824330) because of android and b2g bustage on clobber builds 2013-01-04 17:14:33 +01:00
Mike Hommey b78d8ead5b Bug 824330 - Build services/ during the platform tier and enable services in xulrunner. r=blassey,r=bsmedberg,r=gps 2013-01-04 15:56:20 +01:00
Richard Newman 90daf700c2 Bug 806494 - Part 1: additional logging and safety for header copying. r=gps 2012-12-18 11:43:58 -08:00
Richard Newman b8f7251de3 Merge m-c to s-c (including fixed conflict in Android Sync manifest).
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml
rename : mobile/android/base/resources/drawable/tabs_button.xml.in => mobile/android/base/resources/drawable/tabs_button.xml
rename : mobile/android/base/resources/drawable/tabs_level.xml.in => mobile/android/base/resources/drawable/tabs_level.xml
2012-12-15 17:08:14 -08:00
Richard Newman aa45233a91 Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman ceeb64c2e7 Merge m-c to s-c. 2012-12-10 13:01:43 -08:00
Richard Newman 80a3f4f3ee Merge m-c to s-c. 2012-12-05 23:59:56 -08:00
Richard Newman 311ea9597c Merge m-c to s-c. 2012-11-27 21:24:41 -08:00
Richard Newman 9f33dc8380 Merge m-c to s-c. 2012-11-21 09:37:58 -08:00
Richard Newman da2eaf1742 Merge m-c to s-c. 2012-11-19 18:10:54 -08:00
Alex Keybl d1de145dd7 Merging in version bump NO BUG 2012-11-19 12:03:27 -08:00
Richard Newman d47fc2f956 Bug 817232 - Don't apply incoming deletions for special folders. r=gps 2012-12-04 16:49:55 -08:00
Richard Newman 431420affc Bug 718066 - Pref off FHR on all platforms. r=gps 2012-11-19 19:00:58 -08:00
Gregory Szorc d527aba7e0 Bug 812377 - Health report provider for collecting system info; r=rnewman 2012-11-19 13:18:30 -08:00
Gregory Szorc e2ec35f022 Bug 813226 - Add ability to bypass policy acceptance; r=rnewman
This is needed to support background "always OK" data submission, such
as ADU pings.
2012-11-19 11:31:19 -08:00
Gregory Szorc 6d778b7eaf Bug 811159 - Save last submitted health report to profile; r=rnewman 2012-11-16 10:05:19 -08:00
Gregory Szorc ba1800874b Bug 809644 - Health Report provider for application info; r=rnewman 2012-11-12 15:50:04 -08:00
Gregory Szorc 9fe6a8cad5 Bug 808219 - Firefox Health Reporter service; r=rnewman 2012-11-13 20:22:09 -08:00
Michal Jaskurzynski fc42a78b29 Bug 424712 - Server location needs a slash at the end. r=rnewman 2012-11-12 09:48:26 -08:00
Gregory Szorc c5073721ca Bug 810132 - Add remote deletion requests to policy; r=rnewman 2012-11-09 13:59:40 -08:00
Gregory Szorc 92c4938c9e Bug 809954 - Handle unexpected future dates; r=rnewman 2012-11-09 09:27:00 -08:00
Gregory Szorc 48d4b18c33 Bug 809930 - Make metrics provider collection API more robust; r=rnewman 2012-11-08 15:32:49 -08:00
Gregory Szorc f419461ab6 Bug 810053 - Add explicit test for obsolete document deletion; r=rnewman 2012-11-08 15:24:56 -08:00
Gregory Szorc 49d33ed1c3 Bug 802914 - Implement Bagheera client and server; r=rnewman 2012-11-07 16:25:09 -08:00
Gregory Szorc f26f0a02e2 Bug 804491 - Data submission policy and scheduling driver for Firefox Health Report; r=rnewman 2012-11-07 16:09:13 -08:00
Gregory Szorc 56416b1cff Bug 718067 - Part 3: Add MetricsCollector; r=rnewman 2012-11-05 13:45:35 -08:00
Gregory Szorc b991b8e9ac Bug 718067 - Part 2: Define types for representing metrics data; r=rnewman 2012-11-05 12:50:11 -08:00
Gregory Szorc 1edab3eadb Bug 718067 - Part 1: Create skeletons for services/{metrics,healthreport}; r=rnewman
services/metrics will hold generic metrics code. services/healthreport
report will build on top of that to provide the Firefox Health Report
feature. All functionality will land in subsequent patches.
2012-11-05 12:49:58 -08:00
Gregory Szorc 24fc9cb266 Bug 803377 - Add CommonUtils.convertString; r=rnewman 2012-11-06 08:37:53 -08:00
Gregory Szorc 8d86dcf0f0 Bug 807231 - Add CommonUtils.{getDatePref,setDatePref}; r=rnewman 2012-11-05 12:49:42 -08:00
Gregory Szorc c054a5ad9d Bug 806591 - Add CommonUtils.generateUUID utility function; r=rnewman 2012-11-05 12:49:34 -08:00
Richard Newman 85cab35d85 Bug 804479 - Intermittent test_password_tracker.js, test_history_tracker.js, test_bookmark_store.js, test_forms_tracker.js | test failed (with xpcshell return code: -2147483645), "ASSERTION: thread pool wasn't shutdown… " r=gps 2012-12-05 16:46:25 -08:00
Ed Morley ee93273e84 Backout 545cb0d6b5c6 (bug 811490), 4fd6fc029bbe (bug 722977) for xpcshell failures 2012-11-16 19:15:18 +00:00
Andres Hernandez 97b57987ba Bug 811490 - Convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode; r=ehsan,rnewman
--HG--
extra : rebase_source : 84ba6b5df17aecc78569596fbc02d19fec312b00
2012-11-15 18:33:31 -06:00
Andres Hernandez 09155dbef7 Bug 722977 - Tabs engine uses global Svc.Private to make decisions based on private browsing state; r=ehsan,gps,rnewman
--HG--
extra : rebase_source : 49f920e3a961a6c103bae28d62e2a322a5f9fad1
2012-11-09 10:48:23 -06:00
Ed Morley 408ac4c83c Bug 804479 - Disable test_password_tracker.js, test_history_tracker.js, test_bookmark_store.js, test_forms_tracker.js on debug runs for too many intermittent failures 2013-01-10 14:59:27 +00:00
Richard Newman b1b58dd41f Bug 811490 - Follow-up: convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode. r=trivial, TPS only so DONTBUILD 2013-01-09 14:30:09 -08:00
Ed Morley 48ca903ef9 Backout a38692ea87ae (bug 827303) for xpcshell failures on a CLOSED TREE 2013-01-09 23:45:36 +00:00
Mark Banner 146bf64467 Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
2013-01-09 22:38:34 +00:00
Kyle Huey 9ce11fb93c Bug 813766: Set EXPORTED_SYMBOLS on this instead of the global. r=gps 2012-11-26 08:54:17 -08:00
Ehsan Akhgari eec2e6f2b2 Bug 823725 - Remove the Svc.Private getter since it is no longer used; r=rnewman 2012-12-20 17:43:13 -05:00
Richard Newman e5f7a50a99 Bug 806494 - Part 1: additional logging and safety for header copying. r=gps 2012-12-18 11:42:22 -08:00
Richard Newman 9aa55288cf Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman b7b6981ce2 Bug 808750 - More logging and safety in resource callbacks. r=gps 2012-11-05 17:31:12 -08:00
Richard Newman e867ebadd9 Bug 693427 - More logging and fixes for filelog cleanup. r=gps 2012-11-05 16:05:06 -08:00
Jason Orendorff 36f960f08e Bug 807001 - Change Map and Set size() methods to accessor properties. r=Waldo.
--HG--
extra : rebase_source : bf2809aa1d943caa6349d7b44621cd1b0bb85742
2012-11-02 10:12:36 -05:00
Richard Newman 6092e36cd9 Merge m-c to s-c. 2012-11-01 12:28:15 -07:00
Richard Newman 6d04eaa6ed Merge m-c to s-c. 2012-10-31 17:11:26 -07:00
Richard Newman dad2ef0871 Bug 693427 - Intermittent TEST-UNEXPECTED-FAIL | xpcshell/tests/services/sync/tests/unit/test_errorhandler_filelog.js | test failed (with xpcshell return code: 0) | false == true. r=trivial 2012-10-31 17:07:16 -07:00
Richard Newman d29f11cef0 Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage). 2012-10-29 17:47:04 -07:00
Richard Newman e78c3da7ed Bug 806460 - Part 1: NS_ERROR_ILLEGAL_VALUE in nsINavBookmarksService.insertBookmark while inserting query. r=gps 2012-10-29 15:24:52 -07:00
Richard Newman 8a331845b5 Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps 2012-10-29 15:22:31 -07:00
Richard Newman ecb5f27751 Bug 795800 - Rework test_addons_store to be more robust. r=gps
* * *
Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps
2012-10-25 16:51:32 -07:00
Kyle Huey 0469a02b25 Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon
--HG--
extra : rebase_source : 98337b6a8c07d05e8c961a452dd05a7d75c3c60b
2012-10-31 09:13:28 -07:00
Richard Newman 54de4fc54f Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps 2012-10-23 17:44:33 -07:00
Vicamo Yang a78b5b38c7 Backout 67cb43bb8865: Breaks B2G Marionette 2012-10-31 16:35:11 +08:00
Kyle Huey 9a3674d80a Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon 2012-10-30 12:28:11 -07:00
Ed Morley 4144129728 Backout a145ded68994, e0cf397089ec & 1545e91c658e (bug 798491) for bustage on a CLOSED TREE 2012-10-30 17:02:31 +00:00
Kyle Huey 50b5d3f681 Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon 2012-10-30 08:26:12 -07:00
Richard Newman 588a039d52 Bug 806460 - Part 1: NS_ERROR_ILLEGAL_VALUE in nsINavBookmarksService.insertBookmark while inserting query. r=gps
* * *
Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage).
2012-10-29 15:24:52 -07:00
Richard Newman 7d99628c11 Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps 2012-10-29 15:22:31 -07:00
Richard Newman e5b1c5d03a Merge m-c to s-c. 2012-10-12 11:47:24 -07:00
Richard Newman c37657330d Bug 798430 - Copy our set HTTP headers across channel redirects. r=gps 2012-10-10 11:48:16 -07:00
Richard Newman 63b2c29f6e Merge m-c to s-c. 2012-10-08 17:08:01 -07:00
Alex Keybl 5e5b54cfae Merging in version bump NO BUG 2012-10-08 11:01:15 -07:00
Gregory Szorc 0c9a888a7c Bug 800154 - Refactor how services/ integrates with build system; r=glandium
We now have MOZ_SERVICES_COMMON and MOZ_SERVICES_CRYPTO to control
inclusion of services/common and services/crypto, respectively.
2012-10-11 10:34:09 -07:00
Richard Newman 7edb0ff1e6 Bug 798430 - Copy our set HTTP headers across channel redirects. r=gps 2012-10-10 11:49:21 -07:00
Nick Alexander baea28b72f Bug 790822: Make ensureMillisecondsTimestamp convert to integer. r=gps 2012-09-30 18:12:46 -07:00
Gregory Szorc 9948a801a7 Merge mozilla-central into services-central 2012-09-25 11:00:01 -07:00
Gregory Szorc f96ef85591 Bug 792546 - Part 5: Clean up excessive imports; r=rnewman 2012-09-24 13:46:19 -07:00
Gregory Szorc 3143299126 Bug 792546 - Part 4: Move utility functions to testing-only JS module; r=rnewman 2012-09-24 13:45:49 -07:00
Gregory Szorc bdea70f711 Bug 792546 - Part 3: Move logging functions into standalone module; r=rnewman 2012-09-24 13:43:02 -07:00
Gregory Szorc d16874d957 Bug 792546 - Part 2: Move fake services into testing-only JS module; r=rnewman
We still import these functions in head.js. This will be cleaned up
later once functionality from head.js that uses them is moved into a
testing-only JS module.
2012-09-24 13:42:54 -07:00
Gregory Szorc feb37233f3 Bug 792546 - Part 1: Move rotary engine to a testing-only JS module; r=rnewman 2012-09-24 13:42:31 -07:00
Gregory Szorc 15b3f3976e Bug 792990 - Properly handle add-ons when resetting Sync; r=rnewman
Due to a bug in the add-on sync implementation, resetting Sync would
cause all add-ons to be uninstalled and not replaced with the server
data.
2012-09-21 11:22:59 -07:00
Gregory Szorc fadf7fd538 Merge mozilla-central into services-central 2012-09-18 11:37:04 -07:00
Gregory Szorc a3be692568 Bug 787273 - Part 8: Make TPS go through main.js for service instance; r=rnewman 2012-09-18 11:34:25 -07:00
Gregory Szorc b6376f859c Bug 787273 - Part 7: Expose Status an an instance variable on Service; r=rnewman
The global Status is still there. But Service and its derived objects
avoid the singleton lookup.

There are likely a few lingering tests that reference Status when they
should reference Service.status. These will be dealt with when Status is
refactored.
2012-09-14 16:02:33 -07:00
Gregory Szorc 4192f76f6e Bug 787273 - Part 6: Remove Weave export from service.js; r=rnewman
This is mostly minor cosmetic changes. Weave was being exported from
service.js for no apparent reason. It was mostly used by tests.

There was a reference to it in engines.js, which should have been caught
when the engines were associated with a service instance. engines.js now
does the right thing.

Weave is no longer exported by service.js. Tests and modules no longer
import main.js.

WeaveSvc was also renamed to Sync11Service because why not.

Weave continues to be the main public API.
2012-09-14 16:02:33 -07:00
Gregory Szorc 5ecb759622 Bug 787273 - Part 5: Remove the CollectionKeys singleton; r=rnewman
CollectionKeys is gone. Instead, we export CollectionKeyManager (the
underlying type) and an instance is available on the Service singleton.
2012-09-14 16:02:33 -07:00
Gregory Szorc 7508d3694e Bug 787273 - Part 4: Refactor Identity to not be a singleton; r=rnewman
Access to IdentityManager functionality now goes through the Service
singleton.
2012-09-14 16:02:33 -07:00
Gregory Szorc 86496151d6 Bug 787273 - Part 3: Don't rely on Identity in SyncStorageRequest; r=rnewman
The Identity singleton is going away. This refactors SyncStorageRequest
to not use it. Behavior now works like Resource. Instances are obtained
from the Service singleton and have authentication functionality
attached.
2012-09-14 16:02:32 -07:00
Gregory Szorc 6aed806b4c Bug 787273 - Part 2: Refactor Resource and Record to not rely on singletons; r=rnewman
Resource currently relies on the Identity singleton to perform
authentication. This is bad magic behavior. Resource instances should
authenticate according to the service instance they are associated with.

This patch removes Identity magic from Resource. Everything using
Resource now explicitly assigns an authenticator which comes from
the service instance/singleton. This required API changes to Collection
and Record.

The preferred method to obtain a Resource instance is to call
getResource() on a service instance.

The end result of this patch looks a little weird, especially in test
code. You have things like Service.resource(Service.cryptoKeysURL).
This ugliness will go away when a unified storage service client is
used.
2012-09-14 16:02:32 -07:00
Gregory Szorc ee08725aba Bug 787273 - Part 1: Remove Records singleton; r=rnewman
RecordManager is now an instance of the Service singleton and holds a
reference back to the service which is used to obtain needed "global"
state.
2012-09-14 16:02:32 -07:00
Nick Alexander 865c79a137 Bug 790397: set deleted = false for each record stored via PUT or POST. 2012-09-11 17:22:21 -07:00
Benjamin Peterson 1dc5835e9f Bug 782272 - Only clear the _lazySave timer if it's there. r=gps 2012-09-24 17:06:10 -04:00
Gregory Szorc f955cd5efc Bug 792990 - Properly handle add-ons when resetting Sync; r=rnewman
Due to a bug in the add-on sync implementation, resetting Sync would
cause all add-ons to be uninstalled and not replaced with the server
data.
2012-09-21 11:24:24 -07:00
Richard Newman ca0f557cda Merge m-c to s-c. 2012-08-30 19:26:53 -07:00
Gregory Szorc 55ad987c3a Bug 786489 - Part 2: Change username through Identity not prefs; r=rnewman
The preferred way to change the username is through the Identity
singleton, not by updating a pref and hoping the side-effect is what you
want.
2012-08-29 14:43:41 -07:00
Gregory Szorc c662bc9670 Bug 786489 - Part 1: Update serverURL and clusterURL through Service; r=rnewman
The preferred method to update serverURL and clusterURL is by going
through the SyncService Service singleton, not by setting preferences.
2012-08-29 14:43:41 -07:00
Gregory Szorc 9fc8bd9999 Bug 785225 - Part 11: Burninate trailing whitespace from tests; r=rnewman 2012-08-29 14:43:41 -07:00
Gregory Szorc 2ee91d907e Bug 785225 - Part 10: Reflect API changes in TPS; r=rnewman
The previous parts broke TPS. This fixes them all in one lump patch.
2012-08-29 14:43:41 -07:00
Gregory Szorc e700f1a9c5 Bug 785225 - Part 9: Refactor engines to not use singletons; r=rnewman
Engines now maintain a reference to the service they belong to. This
allows them to obtain references to other engine instances belonging to
that service and that service only.

Stores and trackers now maintain a reference to the engine they belong
to.

Engine managers now maintain a reference back to a service.

The clients singleton has been removed. It now exists as an instance
variable on Service. Parts of ClientsEngine do behave as singletons
(e.g. commands). This will be addressed in future refactoring.
2012-08-29 14:43:41 -07:00
Gregory Szorc a10260dd72 Bug 785225 - Part 8: Don't expose SyncScheduler as a singleton; r=rnewman 2012-08-29 14:43:41 -07:00
Gregory Szorc 290e6ef57e Bug 785225 - Part 7: Bind SendCredentialsController to a Service instance; r=rnewman 2012-08-29 14:43:40 -07:00
Gregory Szorc 5a59ca251a Bug 785225 - Park 6: Move StorageCredentialsController to jpakeclient.js; r=rnewman
I'm not sure why it was in policies.js, as it has everything to do with
J-PAKE exchange.
2012-08-29 14:43:40 -07:00
Gregory Szorc 19432e05ab Bug 785225 - Part 5: Partial removal of Clients singleton; r=rnewman
Clients was being exported and used as a singleton. We still use Clients
as a singleton in some places, but only in test code. The preferred
method to access Clients is now through a service instance.
Weave.Clients is no longer exposed. Callers go through Weave.Service
now.
2012-08-29 14:43:40 -07:00
Gregory Szorc 864a6551e8 Bug 785225 - Part 4: Remove unused exports from Weave; change engine loading; r=rnewman
Lots of exports from the Weave global object weren't being used. This
also changes how engines are loaded. There is now a mapping in
service.js of engine name to filename. Before, it was looking at Weave.
2012-08-29 14:43:40 -07:00
Gregory Szorc 83cd0bea9c Bug 785225 - Part 3: Don't expose ErrorHandler as a singleton; r=rnewman
Some tests still expect there to only be a single instance of
ErrorHandler for the life of the tests. And, ErrorHandler itself is
pretty tighly coupled with being a singleton because it writes out
changes to prefs, etc. But, it's a step in the right direction.
2012-08-29 14:43:40 -07:00
Gregory Szorc f458898f12 Bug 785225 - Part 2: Minimize Engines singleton usage; r=rnewman
Weave.Engines is no longer exported. Service now exposes an
EngineManager instance, which is the new recommended way to get at the
engine manager. Service was updated to reference the internal instance.
2012-08-29 14:43:40 -07:00
Gregory Szorc a740be31b3 Bug 785225 - Part 1: Don't rely on Engines singleton in AddonsReconciler; r=rnewman 2012-08-29 14:43:40 -07:00
Gregory Szorc 04c46a9077 Bug 783721 - Refactor User API service interaction; r=rnewman 2012-08-29 14:43:39 -07:00
Gregory Szorc dbe41b7cd3 Bug 783437 - Add conditions acceptance to token server client; r=rnewman 2012-08-28 13:34:33 -07:00
Gregory Szorc 2d67b1815b Merge mozilla-central into services-central 2012-08-27 12:56:17 -07:00
Alex Keybl 0f6cdb0532 Merging in version bump NO BUG 2012-08-27 12:21:46 -07:00
Ally Naaktgeboren 9e1d6865c4 Bug 589468 - Part 2/2: Change "computer" to "device" in all strings regarding desktop Firefox Sync. r=mconnor
--HG--
extra : rebase_source : 1041808123507a278b6bbddf7d387d6ef18ccfcd
2012-08-29 17:09:32 -07:00
Jim Mathies 0d248e0821 Bug 784165 - Metrofx should use a new appid. r=gavin 2012-09-13 12:29:08 -05:00
Allison Naaktgeboren 66ccd6b722 Bug 644734; r=gps 2012-09-12 15:08:07 -07:00
Jim Mathies 83a42584b3 Bug 817076 - Update various services paths to point to the gre. r=gps 2012-12-05 16:36:27 -06:00
Ehsan Akhgari 5866920e6f Merge mozilla-central into mozilla-inbound 2012-11-19 17:07:53 -05:00
Andres Hernandez 62cf9322bd Bug 811490 - Convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode; r=ehsan,rnewman 2012-11-15 18:33:31 -06:00
Andres Hernandez 0478694ccb Bug 722977 - Tabs engine uses global Svc.Private to make decisions based on private browsing state; r=ehsan,gps,rnewman 2012-11-19 14:44:07 -06:00
Josh Matthews fda5be2065 Bug 723002 - Determine privacy status from provided nsILoadContext in ContentPrefService. r=ehsan 2012-06-30 07:50:07 -07:00
David Rajchenbach-Teller bf032a32a6 Bug 772211 - Get rid of some uses of addVisit. r=mak77, r=rnewman 2013-01-08 19:40:06 -05:00
Gregory Szorc 42693ad1b5 Merge mozilla-central into services-central 2012-08-20 09:34:02 -07:00
Gregory Szorc c1e5bb29a3 Merge mozilla-central into services-central 2012-08-15 16:24:21 -07:00
Gregory Szorc 3ac36d9087 Bug 781952 - Part 3: Remove unused Service._updateCluster; r=rnewman 2012-08-14 11:34:28 -07:00
Gregory Szorc 9031b4425f Bug 781952 - Part 2: Move cluster management out of service.js; r=rnewman 2012-08-14 11:34:20 -07:00
Gregory Szorc e73b016255 Bug 781952 - Part 1: Refactor engine syncing logic out of service.js; r=rnewman 2012-08-14 11:34:14 -07:00
Gregory Szorc 8d916196a9 Bug 781946 - Clean up notifications usage; r=rnewman 2012-08-13 16:51:58 -07:00
Gregory Szorc 81e4b09187 Bug 618233 - Re-disable test_jpakeclient.js on Windows for oranges; r=rnewman 2012-08-13 10:29:28 -07:00
Gregory Szorc 423024c917 Bug 781307 - Remove rules from services/ Makefile.in's; r=glandium 2012-08-09 13:12:29 -07:00
Gregory Szorc 046c2b664a Bug 759487 - Refactor services/sync/Makefile.in; r=glandium 2012-08-09 13:12:26 -07:00
Gregory Szorc 849625e37e Bug 618233 - Enable test_jpakeclient.js on Windows; r=rnewman
May trigger intermittent oranges. Trying to reproduce so we can triage.
2012-08-08 16:43:05 -07:00
Gregory Szorc 4b9c341fed Bug 781348 - Style improvements to service.js; r=rnewman 2012-08-08 16:35:37 -07:00
Gavin Sharp 353b7404d9 Bug 781323: fix about:sync-log, r=gps
--HG--
extra : rebase_source : 168339ad89dd0263b83deb7d9b028d59562cffe0
2012-08-14 15:37:04 -04:00
Mike Hommey 70d7c821af Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Gregory Szorc f30693333f Bug 779589 - Move services/common testing-only JS modules into own directory; r=rnewman
--HG--
rename : services/common/aitcserver.js => services/common/modules-testing/aitcserver.js
rename : services/common/storageserver.js => services/common/modules-testing/storageserver.js
2012-08-01 13:50:55 -07:00
Gregory Szorc 375fc869e0 Bug 779391 - Move deepCopy into CommonUtils; r=rnewman 2012-08-01 12:05:29 -07:00
Gregory Szorc 035c4e7987 Bug 777989 - Make Add-on sync TPS tests work again; r=rnewman 2012-08-01 12:02:48 -07:00
Gregory Szorc bad6844078 Bug 777989 - Update TPS to use new AddonUtils module; r=rnewman 2012-07-31 18:12:12 -07:00
Gregory Szorc 8646bbab43 Bug 777989 - Move add-on helper functions out of add-ons engine; r=rnewman 2012-07-30 17:05:33 -07:00
Sankha Narayan Guria 4e053bc78e Bug 579604 - Save prefs file after setting up Sync; r=gps 2012-07-30 16:05:20 -07:00
Richard Newman 37c8c97b18 Merge m-c to s-c. 2012-07-30 13:04:40 -07:00
Aryeh Gregor d0ad5a7d0c Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Richard Newman 953632c1dd Bug 762606 - Another attempt at stopping tests finishing too soon. r=orange 2012-07-28 18:19:27 -07:00
Richard Newman 5f65e64598 Bug 762606 - Intermittent test_resource_async.js | test failed (again). r=gps 2012-07-26 14:01:43 -07:00
Gregory Szorc 564ccbe7d1 Merge mozilla-central into services-central 2012-07-25 11:20:58 -07:00
Gregory Szorc 6a45e11700 Bug 769500 - Followup to fix timing-related intermittent orange; r=bustage 2012-07-24 22:15:16 -07:00
Gregory Szorc ab5d2f99f7 Bug 776778 - Followup to fix intermittent orange; r=bustage 2012-07-24 22:06:59 -07:00
Gregory Szorc a690d968af Bug 776778 - Implement X-If-Unmodified-Since on GET method; r=rnewman
This reflects changes to the spec in bug 776768.
2012-07-24 16:51:48 -07:00
Gregory Szorc bef2e10280 Bug 776771 - Remove index_above and index_below from storage service; r=rnewman
Removed from spec in bug 775395.
2012-07-24 11:44:04 -07:00
Gregory Szorc 8f247b2952 Bug 776770 - Remove newline encoding from storage service server; r=rnewman
Functionality removed from spec in bug 775798.
2012-07-24 11:43:57 -07:00
Gregory Szorc 513366f6cd Merge mozilla-central into services-central 2012-07-24 10:08:45 -07:00
Gregory Szorc 47efadcd26 Bug 769500 - Add batching APIs to storage service client; r=rnewman 2012-07-23 16:46:38 -07:00
Gregory Szorc 60c58a84c7 Bug 775216 - Percent decode query string members; r=rnewman 2012-07-23 16:39:28 -07:00
Richard Newman 4f2c62a0d6 Bug 763973 - Intermittent test_resource_async.js | test failed (with xpcshell return code: 0) | false == true. r=gps 2012-07-24 19:55:48 -07:00
Mounir Lamouri 939bd4cca2 Bug 775829 - Use the new Permission Manager API in Browser ID. r=sicking 2012-07-20 18:09:12 -07:00
Joshua Cranmer a1186c1020 Bug 773637 - Kill NS_SCRIPTABLE annotations, Part 1: Remove NS_*PARAM annotations. r=ehsan
--HG--
extra : rebase_source : a0b4bc50fece36d9a90fed61431635948bfa33b5
2012-07-06 15:14:07 -05:00
Gregory Szorc 88b5057eeb Bug 775287 - Track request count in storage server; r=rnewman 2012-07-20 12:00:39 -07:00
Patrick McManus 5b9ce7432a bug 770331 - always try and negotiate HTTP Keep-Alive r=biesi
--HG--
extra : rebase_source : d348e3ec56faa48fbed5c4f0f697dee6658e21b2
2012-07-20 08:40:13 -04:00
Jonas Sicking 87c1732c26 Bug 774585: Make about: redirectors reset channel owner to null rather than set an explicit principal so that we'll go through the normal code paths in GetChannelPrincipal. r=bz 2012-07-17 22:22:19 -07:00
Gregory Szorc 9e5fe53e68 Bug 774736 - Move Sync's version to Makefile.in; general cleanup; r=glandium 2012-07-17 10:45:13 -07:00
Tim Taubert ceb8a46a7c merge m-c to fx-team 2012-08-16 11:10:41 -07:00
Dave Townsend cd10174200 Bug 793928: Switch users of the promise library to the new location and move tests files. r=gavin
--HG--
rename : toolkit/addon-sdk/test/Makefile.in => addon-sdk/test/Makefile.in
rename : toolkit/addon-sdk/test/unit/head.js => addon-sdk/test/unit/head.js
rename : toolkit/addon-sdk/test/unit/test_promise.js => addon-sdk/test/unit/test_promise.js
rename : toolkit/addon-sdk/test/unit/xpcshell.ini => addon-sdk/test/unit/xpcshell.ini
2013-02-01 11:43:15 -08:00
Ed Morley 328516ab21 Bug 752243 - Disable test_service_wipeServer.js, test_service_createAccount.js, test_service_changePassword.js, test_aitc_server.js, test_aitc_client.js & test_hashcompleter.js on OS X & Linux for too many intermittent failures 2012-12-13 12:48:42 +00:00
Richard Newman f001aa4e10 Bug 807842 - FHR provider: profile metadata. r=gps 2012-12-11 15:13:00 -08:00
Dave Townsend 7da9c66580 Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused
Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused
2012-05-10 11:33:02 -07:00
Blair McBride 7bd3a6f1f4 Backout 42bc5a310a29 (bug 782881) due to multi-orange. 2012-08-15 23:07:45 +12:00
Dave Townsend 33eb5452fa Bug 782881 - Protect against attempts to use the Add-ons Manager APIs after shutdown. r=Unfocused 2012-05-10 11:33:02 -07:00
Gregory Szorc e2ddb07283 Bug 783437 - Add conditions acceptance to token server client; r=rnewman 2012-08-28 13:34:33 -07:00
Gregory Szorc f98517622f Backout 66a9982a4bc9 (bug 760902) for frequent orange 2012-07-13 23:15:21 -07:00
Anant Narayanan def0adbb1e Bug 760902: Add test for AITC manager GET timer; r=gps 2012-07-13 20:00:09 -07:00
Anant Narayanan d9769d1d70 Bug 761045: Upload locally installed apps on first run; r=gps 2012-07-13 19:52:30 -07:00
Nick Desaulniers 3b2bac6d14 Bug 760910: Handle 401 responses correctly in AITC; r=gps 2012-07-05 09:32:07 -07:00
Anant Narayanan d3c8c0ed92 Bug 772191 - Change default stream encoding of RESTRequest to utf-8; r=philikon 2012-07-13 16:52:31 -07:00
Gregory Szorc 3294c3092a Bug 760895 - Rewrite reconciling algorithm for AITC; r=mconnor 2012-07-13 16:25:08 -07:00
Nick Desaulniers a74e5051c7 Bug 760909: Implement client driven backoff for AITC; r=gps 2012-07-02 14:57:16 -07:00
Anant Narayanan c57f912537 Bug 773717: browserid.org now redirects to login.persona.org; r=gps 2012-07-13 14:03:42 -07:00
Nick Desaulniers bf34def5e1 Bug 760909 - Add onRequest and mock response handling to AITC server; r=gps 2012-07-12 16:52:58 -07:00
Harald Kirschner 12fa13714d Bug 750948 - Implement unit tests for AitC client against mock server; r=gps 2012-06-25 16:39:39 -07:00
Benjamin Peterson 1815db152d Bug 722956: clear async io timer, so it doesn't run after shutdown has started. r=philkon 2012-07-12 16:36:41 -07:00
Gregory Szorc f29dc3257b Merge mozilla-central into services-central 2012-07-12 12:10:52 -07:00
Gregory Szorc c2bc5603c6 Bug 772569 - Remove do_load_httpd_js from services test code; r=rnewman 2012-07-10 11:54:12 -07:00
Gregory Szorc b004f3d931 Merge mozilla-central into services-central 2012-07-10 10:22:21 -07:00
Ryan VanderMeulen 9dd43aec6d Merge the last PGO-green inbound changeset to m-c. 2012-07-09 20:59:12 -04:00
Gregory Szorc b316b317fd Bug 769816 - Send newline-delimited requests instead of JSON; r=rnewman 2012-07-09 15:24:46 -07:00
Anant Narayanan ef75a478a9 Bug 760896: Use CommonUtils.json* in AitC Storage module; r=gps 2012-07-05 17:34:03 -07:00
Gregory Szorc 947b2a0f1a Bug 769864 - Fix intermittent test failure due to timing inconsistency; r=rnewman 2012-07-02 16:44:23 -07:00
Nathan Froyd bfff055672 Bug 370750 - consolidate mochitest files installation; r=glandium
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
Gregory Szorc e0ff4314da Bug 732152 - Implement standalone client for Storage Service 2.0; r=rnewman 2012-06-29 13:30:05 -07:00
Gregory Szorc af0c437fca Bug 760466 - Make JS Storage Server pass Python functional tests; r=rnewman 2012-06-29 13:29:53 -07:00
Gregory Szorc e26986f8c8 Bug 757860 - Load JS HTTP server as a module; r=rnewman
--HG--
rename : services/common/tests/unit/aitcserver.js => services/common/aitcserver.js
rename : services/common/tests/unit/storageserver.js => services/common/storageserver.js
2012-06-29 13:28:17 -07:00
Richard Newman ef8fc9ef5a Merge m-c to s-c. 2012-06-28 16:55:10 -07:00
Anant Narayanan e2bbcf2b41 Bug 744985: Redirect about:apps to apps dashboard; r=gps 2012-06-27 17:39:18 -07:00