Commit Graph

1391 Commits

Author SHA1 Message Date
Adrian Cole 6563ba1ad9 Merge pull request #995 from LeanderBB/openstack-nova-diagnostics
Started work on adding the nova diagnostics command to JClouds
2012-12-04 07:47:31 -08:00
Adrian Cole c30fedec20 updated to employ Reflection.newProxy + AbstractInvocationHandler 2012-12-02 12:27:57 -08:00
Adrian Cole d801fcc157 Merge pull request #1016 from jclouds/flex-base64
Flex base64
2012-12-01 12:12:05 -08:00
Adrian Cole 39bf8f9897 Merge pull request #1014 from ahgittin/fix/cloudstack-niggles
fix cloudstack network NPE, and 2 logging cleanups
2012-12-01 11:12:17 -08:00
Alex Heneveld b7b3a4c333 log debug info at debug, not info 2012-12-01 09:54:19 -08:00
Alex Heneveld 29cd4efab3 no warning needed if it's admin or domain_admin rather than normal user 2012-12-01 09:54:19 -08:00
Alex Heneveld 95b220f26f the associatedNetwork is @Nullable so guard against (a fatal) NPE 2012-12-01 09:54:19 -08:00
Adrian Cole e66219c16e normalized to CryptoStreams 2012-11-30 17:33:53 -08:00
Leander Bessa Beernaert 38be08eb6b Extends JClouds' OpenStack Nova API with the Diagnostics command
The diagnostics command returns a collection of system information
for the a given server. At the moment, there is no formal
specification for this command. Therefore, it is returned as
a Map of hypervisor specific entries and corresponding values.
More information about the command can be viewed here [1]
in the section "Server Diagnostics".

[1] http://api.openstack.org/api-ref.html
2012-11-30 17:40:12 +00:00
Adrian Cole 2674c6d133 fix issue #917: incorrect require in security_group2.clj and elastic_ip2.clj 2012-11-30 09:21:57 -05:00
Anshul Gangwar 9acf58986c changed the access modifiers for constructors of DescribeInstancesResponseHandler and RunInstancesResponseHandler classes 2012-11-29 10:59:32 +05:30
Andrea Turli 84fc1a75e0 fixed registerISO and its tests
adrian`s comments
RegisterISOexpectedTest added
removed ExceptionParser from registerISO test
2012-11-28 08:42:26 +01:00
Adrian Cole c644b74c4c Fix CloudStack ISOClient.get and list ISOs based on test data from http://bugs.cloudstack.org/browse/CS-15572; refactored related tests to expect format 2012-11-27 10:57:13 -08:00
Andrei Savu 9a085e51a0 Issue 773. Support S3 Multi-Object Delete (API) 2012-11-26 16:11:55 +02:00
Adrian Cole 878ec1bcab undid Serializable and added checkstyle InterfaceIsType:allowMarkerInterfaces=false 2012-11-18 09:23:44 -08:00
Andrew Gaul b9e4543cdb Enforce no use of star imports via Checkstyle 2012-11-13 20:51:59 -08:00
Adrian Cole 7d6b268b7f added test for assigning cloudstack vm into an account 2012-11-13 18:57:33 -08:00
Andrew Bayer 06ff68706e Adding assignVirtualMachine command 2012-11-13 18:39:23 -08:00
Andrew Bayer bdb7b7b2c5 Adding ability to specify account and domain when creating CloudStack instances 2012-11-13 18:38:46 -08:00
Everett Toews c6aabb1a31 Moved openstack-cinder and rackspace-cloudblockstorage-us/uk out of labs.
Updated pom.xml files for the move.
2012-11-13 18:48:30 -06:00
Adrian Cole 34d9d05eca Merge pull request #988 from jclouds/dont-generate-when-user-supplies-groupnames
Issue 1121: Don't generate SecurityGroup when user specifies securityGroupNames
2012-11-13 10:11:04 -08:00
Everett Toews 39d90f954e Added Predicates for handling Volume and Snapshot Status. Improved some comments. 2012-11-13 11:08:30 -06:00
Adrian Cole 5a2af5c29e Issue 1121: Don't generate SecurityGroup when user specifies NovaTemplateOptions.securityGroupNames 2012-11-12 22:33:36 -08:00
Adrian Cole 6e492978fa javadoc fixes for TagApi 2012-11-12 22:09:58 -08:00
Adrian Cole 55c3f587f4 Issue 1110: replace TagClient with TagApi in aws-ec2 2012-11-12 18:30:30 -08:00
Adrian Cole bac869dce5 carve out EC2Api/EC2AsyncApi for new features 2012-11-12 17:30:02 -08:00
Andrew Gaul d7380114a6 Enforce use of Atomics.newReference via Checkstyle
Avoids duplicating types.
2012-11-12 11:56:48 -08:00
Andrew Gaul 4af8008b51 Address all existing Checkstyle violations 2012-11-12 10:30:46 -08:00
Andrew Gaul 3ad36d25d5 Enforce no unnecessary parentheses via Checkstyle 2012-11-10 13:22:12 -08:00
Andrew Gaul cca02ae02d Improve use of Splitter.omitEmptyStrings 2012-11-07 22:30:52 -08:00
Everett Toews 2682759b49 Moved the Volume Attachment stuff into its own API to make it totally clear to users that this is the API to use for attaching volumes. 2012-11-07 07:46:11 -06:00
Everett Toews 1636c1f89d Added Cinder service to Keystone test service catalog repsonses. 2012-11-06 14:43:03 -06:00
Andrew Gaul de82496aae Ensure simple boolean expressions via Checkstyle 2012-11-05 11:41:16 -08:00
Adrian Cole 64a8fd0cbb Merge pull request #961 from andrewgaul/checkstyle-collection-helpers
Enforce use of Collection helpers via Checkstyle
2012-11-05 11:38:49 -08:00
Adrian Cole 760824800e Merge pull request #959 from andrewgaul/checkstyle-multiple-variable-declarations
Enforce a single variable declaration per line
2012-11-05 11:36:32 -08:00
Adrian Cole 1ff91e508d Merge pull request #960 from andrewgaul/filesystem-blobkeys-container
Ensure that callers get a well-behaving Set
2012-11-05 11:26:59 -08:00
Adrian Cole 63602feb2c refactored cloudstack expect tests and added CloudStackComputeServiceAdapterExpectTest 2012-11-05 11:28:01 -03:00
Andrew Gaul 3d191253ec Enforce use of Collection helpers via Checkstyle
This ensures that we do not repeat the type name.  Some instances remain
due to auto-generated code in dmtf/cim/Cim*.
2012-11-04 20:45:49 -08:00
Andrew Gaul ffc2fb0eb4 Ensure that callers get a well-behaving Set
Returning a container with a custom add method could confuse callers.
Provide same functionality via Function.
2012-11-04 19:31:31 -08:00
Andrew Gaul 9d643b569a Enforce a single variable declaration per line 2012-11-04 17:37:16 -08:00
Adrian Cole 55025c0764 Merge pull request #954 from andrewgaul/specific-asserts
Prefer specific asserts where possible
2012-11-04 17:24:47 -08:00
Adrian Cole f1333801dd Merge pull request #953 from aledsage/Setting-RunScriptOnNode.Factory
Setting RunScriptOnNode.factory
2012-11-04 17:12:18 -08:00
Adrian Cole f4333157b9 make tests that decode credentials use valid base64 encoded strings 2012-11-04 15:37:49 -08:00
Andrew Gaul bfa3458b97 Prefer specific asserts where possible 2012-11-04 14:40:24 -08:00
Aled Sage 43d6155341 Set EC2 windows-template image id for testing
- Identify the windows-template AMI using id rather than name-matching
2012-11-04 22:29:52 +00:00
Andrew Gaul 0761874578 Prefer Assert.fail over assert
The former cannot be disabled.
2012-11-03 14:51:52 -07:00
Andrew Gaul 08b9982384 Enforce modifier order via Checkstyle
Also fix violations, via:

find -name \*.java | xargs sed -i 's/final static/static final/'
find -name \*.java | xargs sed -i 's/static private/private static/'
find -name \*.java | xargs sed -i 's/static abstract/abstract static/'
2012-11-01 20:01:30 -07:00
Andrew Gaul 88d53b8792 Enforce no empty statements via Checkstyle 2012-11-01 18:59:18 -07:00
Andrew Gaul 35ce78f15a Correct typos 2012-11-01 13:25:44 -07:00
Andrew Gaul b3da8e4603 Remove filesystem dependency on Apache commons-io 2012-10-30 20:48:58 -07:00
Adrian Cole 5da5161485 Merge pull request #909 from andrewgaul/clear-container-timeout-exception
Throw TimeoutException from awaitCompletion
2012-10-30 08:57:20 -07:00
Adrian Cole 7a46979e66 Merge pull request #922 from andrewgaul/checkstyle-newline-eof
Enforce newline at end of file via Checkstyle
2012-10-30 08:55:16 -07:00
Andrew Gaul fd26ba0d40 Simplify FilesystemAsyncBlobStoreTest.tearDown
We should not swallow an IOException and resourcesToBeDeleted only ever
has one file.
2012-10-30 03:01:44 -07:00
Andrew Gaul 93d69ece2b Enforce newline at end of file via Checkstyle
Also address all warnings, via:

find -name \*.java | while read i; do if [ x`tail -c 1 $i` != x"" ]; then echo >> $i; fi; done
2012-10-29 22:12:44 -07:00
Andrew Gaul 709ca69a2d Enforce that all imports are used via Checkstyle
Also remove all unused imports, via:

mvn checkstyle:checkstyle -Dcheckstyle.output.file=/dev/stdout -Dcheckstyle.output.format=plain | tac | awk -v FS=: '/warning/{print "sed -i " $2 "d " $1}' | while read i; do $i; done
2012-10-29 17:11:08 -07:00
Adrian Cole 3a00a2c389 Merge pull request #924 from andrewgaul/copyright-notice
Address minor copyright notice typos
2012-10-29 16:50:01 -07:00
Aled Sage 09425f4f69 Version upgrades
- gson from 2.2 to 2.2.2
- guava from 13.0 to 13.0.1
- rocoto from 6.1 to 6.2
- log4j from 1.2.16 to 1.2.17
- log back from 1.0.0 to 1.0.7
- httpclient from 4.1.3 to 4.2.2
- netty from 3.3.1 to 3.5.9
- slf4j from 1.6.4 to 1.7.2
- testing from various to 6.8
- jetty from 8.1.1 to 8.1.7
- snakeyaml from 1.10 to 1.11
2012-10-29 13:00:44 +00:00
Andrew Gaul e7dde3aff5 Address minor copyright notice typos 2012-10-28 23:27:56 -07:00
Andrew Gaul 336ccfa2e6 Throw TimeoutException from awaitCompletion
This is a common error that callers should interpret correctly.  For
DeleteAllKeysInList, we integrate into its retry and backoff logic,
and for other callers, we continue to propagate RuntimeException.
2012-10-25 13:50:29 -07:00
Adrian Cole 08516ff5d4 Merge pull request #907 from pandriani/master
[CloudStack] allow "," as decimal separator in cpuUsed regular expression
2012-10-24 20:08:03 -07:00
Andrew Gaul caccd9cf4c Prefer Files.copy to copy streams 2012-10-24 17:44:05 -07:00
Pasquale Andriani 256ba24dd0 added test for allowing ',' decimal separator 2012-10-25 01:04:19 +02:00
Pasquale Andriani dfbdc02ea4 Merge remote-tracking branch 'upstream/master' 2012-10-24 22:58:25 +02:00
Pasquale Andriani 8cde490aad allow "," as decimal separator in cpuUsed regular expression 2012-10-23 19:50:26 +02:00
Andrew Gaul 28d7a6f143 Prefer immutable over empty collections
The former does not create an object when calling iterator(), as
discussed here:

https://groups.google.com/d/msg/jclouds-dev/l7BviKDXreA/mP6Ow_RYxIgJ
2012-10-20 15:35:29 -07:00
Adrian Cole 081046d4d6 added S3 PagedIterable adapter 2012-10-18 17:27:32 -07:00
Adrian Cole 238fbceaaa additional test for EU create snapshot 2012-10-15 08:46:26 -07:00
Adrian Cole b49a3d555a Merge pull request #889 from jclouds/issue-1096
Issue 1096: Guice errors when trying to get a signer for a keystone v2 password-auth BlobStore
2012-10-10 04:06:33 -07:00
Adrian Cole ffa9cd3bb0 corrected guice bindings for swift-based blob signatures and backfilled expect tests 2012-10-10 12:03:23 +02:00
Andrew Bayer 24e485c829 Fixing CloudStack TemplateFilter enum to work with 3.x API properly 2012-10-09 12:31:44 -07:00
Adrian Cole 99d3422b4d added id to endpoint and used only endpoint.versionId to enforce endpointVersion 2012-10-08 15:59:04 -04:00
Adrian Cole a02c79c7f4 Merge pull request #887 from andreisavu/issue-973
Issue 973. Performance problems with Synaptic's Atmos service
2012-10-08 12:50:42 -07:00
Adrian Cole 14ad17108f Issue 671: NPE on aws-ec2 w/vpc security groups 2012-10-08 15:39:51 -04:00
Andrei Savu 0d8848b397 Replaced IllegalStateException with KeyAlreadyExistsException and fixed '\n' typo 2012-10-08 18:07:43 +03:00
Adrian Cole 363d996f19 Merge pull request #886 from andrewgaul/local_blob_request_signer
Rename to LocalBlobRequestSigner
2012-10-08 06:46:43 -07:00
Andrei Savu 03dc864115 Issue 973. Performance problems with Synaptic's Atmos service and writing new blobs 2012-10-08 16:26:40 +03:00
Andrew Gaul 9f6b9d4d8a Rename to LocalBlobRequestSigner
Missing commit from the Filesystem and Transient unification.
2012-10-07 22:54:03 -07:00
Andrew Gaul 9024c77405 Improve use of Charsets 2012-10-07 22:31:49 -07:00
Andrew Gaul 02e1a54220 Improve use of File constructor 2012-10-06 19:28:27 -07:00
Adrian Cole 5da084d6c4 Merge pull request #868 from andrewgaul/filesystem-get-all-container-names
Simplify filesystem blobstore getAllContainerNames
2012-10-05 10:10:57 -07:00
Andrew Gaul b8cd2b9ead Simplify filesystem blobstore getAllContainerNames
This commit removes the dangerous behavior of calling File.delete in
Iterator.remove and helps migrate away from Apache commons-io.
2012-10-05 09:34:33 -07:00
Adrian Cole 298856bab0 Merge pull request #876 from andrewgaul/log4j-line-wrapping
Fix confusing line wrapping
2012-10-04 16:36:04 -07:00
Andrew Gaul 222bddb5fa Fix confusing line wrapping 2012-10-04 16:07:48 -07:00
Andrew Gaul ceb203c10a Improve use of InputSupplier helpers 2012-10-02 18:18:51 -07:00
Adrian Cole 418097d4e6 Merge pull request #869 from andrewgaul/filesystem-image-resource
Use Iterator for IMAGE_RESOUCE
2012-10-02 17:44:27 -07:00
Andrew Gaul 0140020c0e Use Iterator for IMAGE_RESOUCE
Also ensure immutability.  Remove some unused members.
2012-10-02 09:45:46 -07:00
Adrian Cole 376db9e239 refactored openstack-nova expect tests so that they don't mask zone ids from subclasses 2012-09-29 18:35:03 -07:00
Adrian Cole b77a3bf0c8 cleanup and example of overriding nova api version 2012-09-29 14:03:25 -07:00
Andrew Gaul 34b9106b6d Handle InputStreamPayload in filesystem putBlob
We must save input to subsequently calculate its MD5.  Also tidy up
testWritePayloadOnFile.  Closes #1093.  Test case written by Tom
Manning.
2012-09-29 11:52:52 -07:00
Adrian Cole a77a80f030 Issue 1092: fix hostname when path-based buckets are used in non-default location 2012-09-25 21:22:17 -07:00
Adrian Cole 0e001b6336 Merge pull request #853 from andrewgaul/remove-ioutils-tostring
Prefer Guava InputSupplier methods over IOUtils
2012-09-25 13:23:48 -07:00
Andrew Gaul 44a8ed155c Prefer Guava InputSupplier methods over IOUtils 2012-09-25 11:44:10 -07:00
Adrian Cole 4ffe56c979 corrected equals/hashCode as map builder doesn't honor that 2012-09-23 14:33:53 -07:00
Adrian Cole 1864606d4e added SQS utility for fetching all messages 2012-09-21 17:30:23 -07:00
Adrian Cole 4990934470 added get queue by name for SQS 2012-09-20 15:26:06 -07:00
Everett Toews ffc0d681d5 Increased container count for cloudfiles tests. 2012-09-20 02:32:21 +00:00
Andrew Gaul 0c440c9c8a Fix deleteAndVerifyContainerGone return value
Return true if the container does not exist -- this matches the
behavior of Atmos and Swift.  This allows deleteAndEnsurePathGone to
terminate correctly with S3.
2012-09-19 13:39:02 -07:00
Adrian Cole 28d766b9df bumped to 1.6.0-SNAPSHOT 2012-09-17 01:43:52 -07:00
Adrian Cole 3d2504e1e4 updated cloudsigma tests 2012-09-16 23:40:10 -07:00
Adrian Cole bff49f8311 compatible tags across 2.0 and 4.0 2012-09-16 23:40:05 -07:00
Adrian Cole 54ec689019 stable openstack 2012-09-16 22:38:22 -07:00
Adrian Cole d766f8d4e3 stable ec2 2012-09-16 22:37:13 -07:00
Adrian Cole 605d6580de metadata for nova 2012-09-16 17:07:42 -07:00
Jeremy Daggett c078cb2170 Initial contribution to metadata APIs 2012-09-16 16:22:48 -07:00
Adrian Cole 612aa2c93a update for elastichosts to support metadata and tags 2012-09-16 16:21:09 -07:00
Adrian Cole 80d3b17720 elastichosts test glitches 2012-09-16 14:58:34 -07:00
Adrian Cole a0c383334e Boolean -> boolean 2012-09-16 14:58:07 -07:00
Andrei Savu 64a9888622 Merge remote-tracking branch 'upstream/master' into generic-tempurl 2012-09-16 23:11:30 +03:00
Andrei Savu 1e50fbeb69 Switched from a Provider to a Supplier as requested 2012-09-16 23:08:17 +03:00
Adrian Cole 6f5ebf3e90 Issue 1085:deprecate getRegion from EC2 domain objects 2012-09-16 12:55:48 -07:00
Adrian Cole fae9ec1228 straightened out AdminActionsApi test 2012-09-16 12:38:01 -07:00
Adrian Cole 09065a32ca value and statistics values are not compatible in cloudwatch 2012-09-16 12:38:00 -07:00
Adrian Cole f7feb0248a fixed bad test assertions in openstack-nova 2012-09-16 12:38:00 -07:00
Andrei Savu 3898f1eee2 Removed two unused imports 2012-09-16 21:53:58 +03:00
Andrei Savu 080d142ae1 Generic support for Swift TempUrl middleware 2012-09-16 21:46:51 +03:00
Andrew Phillips 085bc43d48 Allow for slightly inaccurate system timers in SQSErrorRetryHandlerTest (see https://groups.google.com/d/topic/jclouds-dev/uQsqlR-CEOQ/discussion) 2012-09-16 18:34:55 +01:00
Adrian Cole b5f60f1e70 pagination and consistency cleanup on openstack 2012-09-16 00:19:30 -07:00
Adrian Cole dcca748a79 unused imports 2012-09-15 23:48:35 -07:00
Adrian Cole b951276ec3 cleaned up aws apis 2012-09-15 23:47:44 -07:00
Adrian Cole 0b31622267 cleaned ec2 instance type 2012-09-15 14:05:24 -07:00
Adrian Cole c7cb9951a8 moved sqs/aws-sqs live 2012-09-14 18:15:50 -07:00
Andrew Phillips 2984626b9c issue 1069: Allowing @Nullable container to be null in compareTo 2012-09-14 12:35:45 -04:00
Everett Toews e19d27f97c Updates to Rackspace CDN Container Metadata handling. Added feature to Purge CDN Object. Added feature to set default index and error pages for CDN based static website. 2012-09-11 21:10:59 -05:00
Andrei Savu f0e95ced34 Replaced Instant.now() with System.currentTimeMillis() and removed some unused imports 2012-09-11 23:16:08 +03:00
Andrei Savu 0e8e07ce38 Removed unused import and added @Test annotation 2012-09-10 22:44:26 +03:00
Andrei Savu 49bde19fa0 Add support for Swift TempURL Middleware 2012-09-10 13:45:55 +03:00
Everett Toews 73746588f4 Moved HP Storage Container Metadata parsing to Swift since it's a standard Swift feature.
Moved HP Storage createContainer(String, CreateContainerOptions) to CommonSwiftClient since it's a standard Swift feature.
Added support for setting Swift Container Metadata.
Added support for deleting Swift Container Metadata.
Added copy object feature to Swift.
Removed unnecessary TODO comment.
Changed DeleteContainerMetadataOptions to just be a List.
Changed CopyObjectOptions to be just be a String. Changed CommonSwiftClient.setContainerMetadata() to use just a Map for metadata. Added ExpectTests.
Changed setContainerMetadata() to use Iterable instead of List for more generic type goodness. Changed copyObject() to use 4 String params instead of 2 String params to be similar to other such methods in jclouds.
2012-09-08 15:02:01 -05:00
Richard Downer 8b29a6c4f6 Javadoc update for CloudStack Template.getStatus() 2012-09-03 11:35:19 +03:00
Richard Downer ca7ede5932 CloudStack template status parsing update
Remove the "Successfully Installed" message as it's not clear what its
definition is or even if it's possible to get that message - see
http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev/201209.mbox/%3CCED8A372-E235-4C32-A15E-F021CC449BFD%40citrix.com%3E
2012-09-02 10:22:33 +03:00
Richard Downer 8aca1828fc Update parsing of Status in CloudStack Template
The CloudStack Template status field is generally presented as human
readable text. This commit extends the enum fromValue() to understand
the known status strings in CloudStack 3.0.4.
2012-09-01 17:56:49 +03:00
Adrian Cole c0e8470952 default region endpoint for rackspace legacy apis 2012-08-29 23:47:05 -07:00
Andrew Donald Kennedy 88a84ae3fb Added test descriptions and dependencies to basic Nova live tests 2012-08-24 21:19:35 +03:00
Andrew Donald Kennedy 0a7a9f378e Updated KeyPair toString method to make expect test pass 2012-08-23 17:08:06 +03:00
Andrew Donald Kennedy fec936ca36 Update Nova extension tests to use covariant returns 2012-08-23 08:17:30 +03:00
Andrew Donald Kennedy 7d70b5ddc3 Updated NovaComputeService and FloatingIp cache to deal with extensibility 2012-08-23 07:29:40 +03:00
Andrew Donald Kennedy 931aa7838a Make all Nova extensions extensible 2012-08-23 06:46:25 +03:00
Adrian Cole 05e495fe08 CCE in elasticstack 2012-08-17 22:57:39 -07:00
Adrian Cole bb37f61965 Merge pull request #788 from grkvlt/openstack-extensibility-fixup
Openstack extensibility fixup
2012-08-16 14:56:40 -07:00
Andrew Donald Kennedy 1eee03ee1f Add missed Optional covariant return types for Keystone 2012-08-16 22:32:46 +01:00
Andrew Gaul e7040f8cc8 Use appropriate Predicates helpers
Also capitalize constant.
2012-08-16 13:35:28 -07:00
Andrew Gaul 130921fc29 Reduce HP Cloud authentication token timeout
I see a 12 hour expiry when requesting a new authentication token.
Reducing this timeout should not hurt in any case.
2012-08-15 17:46:52 -07:00
Andrew Donald Kennedy 2debb53e83 Merge Keystone optional admin API provider with optional extension provider 2012-08-14 03:27:34 +01:00
Andrew Donald Kennedy 8ae33f2315 Added binding for optional extensions 2012-08-14 02:23:54 +01:00
Andrew Donald Kennedy 0da2616737 Make the OpenStack extension lists accessible for all APIs. Copied the Nova extension related code to the shared keystone package and added providers for extensions and aliases to all modules 2012-08-13 22:22:04 +01:00
Adrian Cole 0666a6fbde fixed broken test 2012-08-12 10:00:17 -07:00
Adrian Cole 0f0bc429c1 threading issue in test 2012-08-12 09:31:18 -07:00
Adrian Cole b055fb1233 Merge pull request #780 from grkvlt/openstack
Openstack Extensibility
2012-08-12 09:29:51 -07:00
Andrew Donald Kennedy 9acfa880d4 openstack-nova extensibility 2012-08-12 12:29:36 +01:00
Andrew Donald Kennedy 6c9524dabc openstack-keystone extensibility 2012-08-12 12:04:54 +01:00
Adrian Cole c7f35d3bb1 removed invalid @Nullable usage and also usage of javax package usage 2012-08-11 20:59:16 -07:00