adrian.f.cole
|
480fc9b31a
|
Issue 112: terremark now supports clone
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2622 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-09 22:52:26 +00:00 |
adrian.f.cole
|
947d00ac5e
|
Issue 112: changes for terremark upgrade
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2619 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-08 23:26:32 +00:00 |
adrian.f.cole
|
4cf75310c5
|
Issue 112: updated to latest schema
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2618 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-08 20:30:15 +00:00 |
adrian.f.cole
|
6a5a4df606
|
Issue 144: replace WithinThreadExecutorService with com.google.common.util.concurrent.Executors.sameThreadExecutor
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2616 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-06 22:21:24 +00:00 |
adrian.f.cole
|
e0a875333f
|
Issue 112: better error handling and timeouts
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2614 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-06 19:37:21 +00:00 |
adrian.f.cole
|
cdac09e973
|
Issue 112: fixed catalog and orgs to be plural; added error to task
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2606 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-06 01:29:08 +00:00 |
adrian.f.cole
|
e2235e48f8
|
Issue 112: fixed catalog and orgs to be plural; added error to task
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2605 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-06 01:28:14 +00:00 |
adrian.f.cole
|
15c147cd25
|
Issue 112: multiple ports now work
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2603 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-05 21:41:57 +00:00 |
adrian.f.cole
|
bdbb6d0ec9
|
corrected license of pom.xml files
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2564 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2010-01-01 17:56:29 +00:00 |
adrian.f.cole
|
32ab37d3d7
|
Fixed license error caught by libcloud: jclouds isn't licensed to Apache, it just uses that license. thanks guys
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2558 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-31 17:36:46 +00:00 |
sharedocs1@gmail.com
|
caaf950fc1
|
Rewritten the distribution generation to a) use descriptors from a shared dependency b) correctly package transitive dependencies and c) correctly JarJar these dependencies
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2517 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-24 19:50:37 +00:00 |
adrian.f.cole
|
d22717bbcc
|
Issue 112: only create port 22 as there are persistent errors creating multiple internet services
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2509 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-23 07:10:32 +00:00 |
adrian.f.cole
|
7c2f281d64
|
Issue 112: updated to install more ports
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2507 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-23 06:26:23 +00:00 |
adrian.f.cole
|
082d5404a9
|
Issue 112: added delete disk command
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2506 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-23 06:13:59 +00:00 |
adrian.f.cole
|
c53d246223
|
Issue 112: added configureVApp
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2502 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-23 03:18:10 +00:00 |
adrian.f.cole
|
9c4ff83f25
|
Issue 139: introduced default exception for 404 errors
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2501 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-22 00:05:16 +00:00 |
adrian.f.cole
|
1e6848f7c8
|
Issue 112: progress in clone/configure; fixed bug in computeClient.stop()
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2500 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-21 22:52:20 +00:00 |
adrian.f.cole
|
cf438c9252
|
Issue 112: started work on configureVApp
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2499 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-21 09:26:03 +00:00 |
adrian.f.cole
|
040b3855ff
|
Issue 112: added configureNode and configureInternetService
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2497 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-21 08:31:32 +00:00 |
adrian.f.cole
|
5e8543261a
|
Issue 112: removed invalid status code
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2493 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-21 05:12:41 +00:00 |
adrian.f.cole
|
29e92bfe60
|
Issue 112: added getIpAddressesForNetwork
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2492 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-21 05:10:30 +00:00 |
adrian.f.cole
|
bdb38fdf23
|
Issue 112: added cloneVApp and getPublicIp
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2490 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-21 03:58:37 +00:00 |
adrian.f.cole
|
2a06d9a37d
|
Issue 112: added getNetwork()
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2487 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-21 01:50:33 +00:00 |
sharedocs1@gmail.com
|
0e3fb8d686
|
Removed vcloud as a provider in the package and instead made terremark and hostingdotcom include it as a library. This is more consistent with the way blobstore is used by other providers. See issue 127.
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2483 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-20 22:35:47 +00:00 |
adrian.f.cole
|
a2c36cedb2
|
Issue 112: missed files
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2481 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-20 17:20:17 +00:00 |
sharedocs1@gmail.com
|
0b449924b3
|
Last tweaks (for the moment) to the Maven assembly. See http://code.google.com/p/jclouds/issues/detail?id=127
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2479 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-20 14:38:06 +00:00 |
adrian.f.cole
|
ee1e4ca59c
|
Issue 112: Added catalog and template queries. clarified api syntax
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2478 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-20 09:10:40 +00:00 |
adrian.f.cole
|
98371e6b37
|
Issue 112: moved NamedResource to vcloud as it is only used there. added id-based getVDC and getTasksList
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2471 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-19 08:30:53 +00:00 |
adrian.f.cole
|
ce1b6dea27
|
Issue 130: added server state
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2462 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-18 07:44:52 +00:00 |
adrian.f.cole
|
9253e755bd
|
Issue 112: corrected status
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2461 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-18 07:11:23 +00:00 |
adrian.f.cole
|
4280bd1f14
|
Issue 112: added datacenter to instantiate vapp args, added getOrganization
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2458 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-18 01:16:16 +00:00 |
adrian.f.cole
|
8116d47b67
|
Removed dependency of apache commons-io as it overlaps with guava. note guava will include google collections soon
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2457 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-17 20:10:58 +00:00 |
sharedocs1@gmail.com
|
b3907f7f88
|
Added skeleton READMEs for projects. See http://code.google.com/p/jclouds/issues/detail?id=127
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2452 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-17 15:17:52 +00:00 |
adrian.f.cole
|
8c5f3bec4a
|
Issue 112: change task to be id and not uri based
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2449 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-16 19:35:02 +00:00 |
adrian.f.cole
|
0dc9f42502
|
Issue 129, Issue 130: added ec2 to abstraction and ant tool
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2446 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-16 08:24:25 +00:00 |
adrian.f.cole
|
54e1ddbda0
|
Issue 112: update taskparser for hosting.com
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2445 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-16 06:17:58 +00:00 |
adrian.f.cole
|
f9e5839134
|
Issue 112, Issue 129, Issue 130: add hosting.com to compute provider and ant tool
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2444 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-16 03:49:13 +00:00 |
adrian.f.cole
|
9518a67228
|
Issue 130, Issue 129: revised compute abstraction to be more resource oriented. added GET to ant
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2443 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-16 00:42:40 +00:00 |
adrian.f.cole
|
2ee25b9629
|
Issue 112: updated to latest hosting.com api
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2442 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-16 00:41:29 +00:00 |
adrian.f.cole
|
da8206a64a
|
Issue 112: added factory
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2436 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-15 16:51:24 +00:00 |
adrian.f.cole
|
96c9758da8
|
Issue 128: added atmos to vfs
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2427 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-15 01:05:58 +00:00 |
sharedocs1@gmail.com
|
5360144084
|
Formatting and copyright cleanup, and removing some unnecessary POM entries
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2424 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-14 13:36:20 +00:00 |
adrian.f.cole
|
b55d2165d0
|
Issue 131: regression
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2413 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-13 23:52:56 +00:00 |
adrian.f.cole
|
4a22f808d1
|
Issue 134: switch to typed payloads for http requests and blob types
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2410 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-13 20:46:48 +00:00 |
adrian.f.cole
|
74be2180d3
|
Issue 131: reorganized package structure
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2409 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-13 06:42:22 +00:00 |
adrian.f.cole
|
1eb4619faa
|
Issue 131: extract out bouncycastle
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2408 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-13 05:16:26 +00:00 |
adrian.f.cole
|
507794042e
|
Issue 131: move joda to extension
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2407 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-13 02:24:30 +00:00 |
adrian.f.cole
|
76e624e66c
|
increased timeout
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2404 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-12 20:57:46 +00:00 |
adrian.f.cole
|
0703d20b8c
|
Issue 112: updated support for terremark, adding ability to remove public ip addresses no longer in use
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2403 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-12 20:46:42 +00:00 |
adrian.f.cole
|
193de5814e
|
Issue 112: changed tests to only use port 22 until internet service issue is worked out
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2402 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-12 06:23:05 +00:00 |
adrian.f.cole
|
f7a814bc04
|
Issue 112: progress on internetservice
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2401 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-12 05:22:41 +00:00 |
sharedocs1@gmail.com
|
573d654d7d
|
Cleaned up POMs (removed unnecessary <packaging>jar</packaging> and moved a few things around)
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2398 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-11 16:36:56 +00:00 |
adrian.f.cole
|
2fddd3223e
|
Issue 130, 129, 112: added ability for terremark to remove its dependencies. added profile and image objects. refactored ant to include logger
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2396 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-10 23:12:57 +00:00 |
adrian.f.cole
|
6aeb907620
|
Issue 129: only use uri to get abstract services. credentials are embedded in the uri, urlencoded as necessary
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2387 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-09 01:56:27 +00:00 |
adrian.f.cole
|
de66d187ae
|
Issue 112: updated vcloud version
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2383 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-07 23:52:07 +00:00 |
adrian.f.cole
|
9e340f286e
|
Issue 128: added initial vfs module and fixed dependent bugs
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2374 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-07 07:09:57 +00:00 |
adrian.f.cole
|
0af62ac24d
|
Issue 112: updated to latest version of hosting.com
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2372 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-04 23:47:37 +00:00 |
adrian.f.cole
|
dcd2eb3403
|
Isue 112: hostingdotcom progress
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2367 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-03 07:56:25 +00:00 |
adrian.f.cole
|
1173689417
|
Issue 112: stabalizing vcloud support
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2365 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-03 01:53:18 +00:00 |
adrian.f.cole
|
638c80e58d
|
Issue 112: interim progress on hosting.com
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2364 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-12-02 17:02:33 +00:00 |
sharedocs1@gmail.com
|
00df6d2817
|
Removed local config files (sorry, Ivan!) and added svn:ignore information.
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2320 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-25 07:21:42 +00:00 |
adrian.f.cole
|
2cd5bfa7cd
|
Issue 112: hostingdotcom
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2314 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-23 00:46:51 +00:00 |
adrian.f.cole
|
4b43b70a53
|
Issue 112: normalized os type
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2299 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-17 21:17:03 +00:00 |
adrian.f.cole
|
09adeebe3d
|
Issue 112: created vcloud tester, converted to lookup api version dynamically
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2295 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-17 02:53:10 +00:00 |
adrian.f.cole
|
df95eb10bb
|
Issue 121: tuned timeouts
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2294 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-16 00:19:49 +00:00 |
adrian.f.cole
|
bc238bc507
|
Issue 121: converted all modules to sync/asyc
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2293 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-15 23:16:38 +00:00 |
adrian.f.cole
|
9a1abce72f
|
Issue 112: added better testing for cloud compatibility
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2290 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-15 01:48:27 +00:00 |
adrian.f.cole
|
edf82a7047
|
Issue 112: pulled terremark-specific features into its own module
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2289 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-14 06:58:41 +00:00 |
adrian.f.cole
|
1d3fa374c8
|
Issue 112: added initial support for hosting.com
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2288 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-14 06:34:36 +00:00 |
adrian.f.cole
|
3aa7e73351
|
Issue 112: added support for most Terremark Internet Services Functions
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2287 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-14 00:57:17 +00:00 |
adrian.f.cole
|
c7306a255f
|
Issue 112: added options for instantiating a vapp template
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2286 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-13 00:32:03 +00:00 |
adrian.f.cole
|
a260d15115
|
Issue 112: simplified instantiate instance
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2281 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-12 23:28:07 +00:00 |
sharedocs1@gmail.com
|
5e6ef2d068
|
Adding svn:ignore part 2.
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2280 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-12 23:25:47 +00:00 |
sharedocs1@gmail.com
|
8a7f1e42e0
|
Adding svn:ignore part 1.
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2273 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-12 22:55:18 +00:00 |
adrian.f.cole
|
633a38b502
|
Issue 119: fixed encoding in unit tests
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2270 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-12 18:51:17 +00:00 |
adrian.f.cole
|
f8377f3adc
|
Issue 112: added getVApp support for terremark
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2257 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-12 01:29:05 +00:00 |
adrian.f.cole
|
6ef0f55ee4
|
Issue 112: added lifecycle commands
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2247 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-11 03:02:33 +00:00 |
adrian.f.cole
|
37d5d4f071
|
Issue 112: support instantiation
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2245 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-10 02:12:06 +00:00 |
adrian.f.cole
|
7f73d1761a
|
Issue 112: added tasks list
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2244 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-09 23:58:05 +00:00 |
adrian.f.cole
|
79280f3484
|
Issue 112: separated out terremark from default vcloud implementation
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2243 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-09 22:34:26 +00:00 |
adrian.f.cole
|
eb101f6263
|
Issue 112: completed get vDC and also added a separate parser for Terremark
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2242 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-09 19:06:50 +00:00 |
adrian.f.cole
|
7602f1b7b8
|
Issue 112: formatting and pulled shareable code into core
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2241 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-09 17:44:00 +00:00 |
adrian.f.cole
|
5d4a5622fc
|
fix file headers
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2051 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-06 21:07:35 +00:00 |
adrian.f.cole
|
1f92756a97
|
Issue 112: added more support and changed classnames to match docs
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2045 3d8758e0-26b5-11de-8745-db77d3ebf521
|
2009-11-06 16:31:55 +00:00 |