Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pushing the 0.4.0 release live #202

Merged
merged 1,046 commits into from
Jan 19, 2013
Merged
Changes from 3 commits
Commits
Show all changes
1046 commits
Select commit Hold shift + click to select a range
009c74d
Merge pull request #16 from jcookems/test467
jcookems Dec 12, 2012
17c436a
Merge pull request #540 from jcookems/dev
jcookems Dec 12, 2012
3494e05
Exposing links from ODataEntity class
Dec 13, 2012
c1e2126
Looking for links based on rel, not title
Dec 13, 2012
8cdcb8b
Exposing immutable LinkInfo from public API, with only properties ODa…
Dec 13, 2012
a50bed1
Merge pull request #24 from christav/job-input-output-assets-working
Dec 13, 2012
11435cf
Merge pull request #545 from christav/dev
Dec 13, 2012
6a0a930
get the content key encryption part working.
Dec 13, 2012
05103a4
Deleted ListTasksResult
Dec 13, 2012
8ffec2f
Fixed token manager cache poisoning bug
Dec 13, 2012
90d6994
Merge pull request #27 from christav/delete-dead-code
Dec 13, 2012
ba4b981
Merge pull request #546 from christav/dev
Dec 13, 2012
3125ece
Merge pull request #28 from christav/fix-token-manager-385
Dec 13, 2012
26b12f8
Merge pull request #547 from christav/dev
Dec 13, 2012
91fdd22
Can now list input and output assets for jobs
Dec 13, 2012
57dba1e
Merge pull request #57 from WindowsAzure/dev
Dec 13, 2012
ed749f5
Merge pull request #58 from gcheng/dev
Dec 13, 2012
65afafc
get upload encrypted file working properly.
Dec 13, 2012
c41cc90
Merge branch 'security' of https://github.com/gcheng/azure-sdk-for-ja…
Dec 13, 2012
a2e7de4
resolve merge conflict
Dec 13, 2012
11d915d
Merge pull request #29 from christav/list-job-assets-508
Dec 13, 2012
be3e551
Merge pull request #548 from christav/dev
Dec 13, 2012
1fc20d5
Merge pull request #59 from WindowsAzure/dev
Dec 13, 2012
6d4934b
Merge pull request #60 from gcheng/dev
Dec 13, 2012
e2c7980
add tasks list to job
Dec 13, 2012
2827c0e
Removed getRestServiceUri from contract, public API.
Dec 13, 2012
9754503
Merge pull request #61 from gcheng/jobtaskbugs
Dec 13, 2012
02b6e43
Merge pull request #549 from gcheng/dev
Dec 13, 2012
60eb02f
Fixed access policy integration test failures
Dec 13, 2012
c864a9c
Fixed two test breaks, removed expiration as a settable property for …
Dec 13, 2012
bab9d55
add getters and setters to task
Dec 13, 2012
656e491
fix task unit tests
Dec 14, 2012
1c7153c
Added enums for state, options
Dec 14, 2012
ac14485
Merge pull request #31 from christav/test-fixes-527-544
Dec 14, 2012
6506811
Merge pull request #550 from christav/dev
Dec 14, 2012
16eba4e
Merge pull request #30 from christav/remove-getrestserviceuri-518
Dec 14, 2012
230aa63
Merge pull request #551 from christav/dev
Dec 14, 2012
89eb936
Fixing breakage caused by merge issues
Dec 14, 2012
8062bc6
Added fluent setters for list query params
Dec 14, 2012
f87713a
Merge pull request #32 from christav/task-options-as-enum-522
Dec 14, 2012
3da3751
Merge pull request #553 from christav/dev
Dec 14, 2012
fc05523
code review feedback.
Dec 14, 2012
a09614c
code review feedback.
Dec 14, 2012
b8dec02
Merge pull request #62 from gcheng/taskrequirement
Dec 14, 2012
dfba509
Merge pull request #554 from gcheng/dev
Dec 14, 2012
782905e
Merge pull request #33 from christav/fluent-list-query-params
Dec 14, 2012
5a0876b
Merge pull request #555 from christav/dev
Dec 14, 2012
ab3a2ab
Added getters for links
Dec 14, 2012
809002d
Can now get tasks from job
Dec 14, 2012
319a564
Successfully retrieving input/output assets from task
Dec 14, 2012
24ac519
Merge pull request #34 from christav/list-task-assets-working-534
Dec 14, 2012
f54155f
Merge pull request #556 from christav/dev
Dec 14, 2012
eadf37c
Removing setExpirationTime from locator update, and removing verifica…
Dec 14, 2012
d996048
no start time.
Dec 14, 2012
0f59a00
Listing content keys for assets
Dec 14, 2012
be1c86f
Removed AssetFile.list(assetId), added AssetFile.list(link) and Asset…
Dec 14, 2012
25317ff
Merge pull request #63 from gcheng/nostarttime
Dec 14, 2012
86462ac
Merge pull request #557 from gcheng/dev
Dec 14, 2012
21ca170
Getting locators from assets
Dec 14, 2012
a11747d
Added parent assets link
Dec 14, 2012
d9dc999
Locator relationships added
Dec 15, 2012
6b1b52b
Updating api version header to 2.0
Dec 15, 2012
a7347f2
Merge pull request #37 from christav/update-ms-version-542
Dec 15, 2012
a9c8d4d
Merge pull request #36 from christav/list-other-asset-links-507
Dec 15, 2012
a9db001
Merge pull request #558 from christav/dev
Dec 15, 2012
3491432
Merge pull request #64 from WindowsAzure/dev
Dec 15, 2012
4b6de12
Merge pull request #65 from gcheng/dev
Dec 15, 2012
2825f3c
Renaming EntityCreationOperation to EntityCreateOperation for consist…
Dec 15, 2012
59c9897
enable the submission of decryption job.
Dec 15, 2012
5b44499
Merge branch 'security' of https://github.com/gcheng/azure-sdk-for-ja…
Dec 15, 2012
d5dde55
Update TaskState according to feedback from nimbus team.
Dec 15, 2012
72e3372
Merge pull request #38 from christav/renaming-entity-types
Dec 15, 2012
875d24f
Merge pull request #560 from christav/dev
Dec 15, 2012
bbec594
Merge pull request #35 from christav/locator-expiration-not-used-541
jcookems Dec 15, 2012
31e49c4
Merge pull request #562 from christav/dev
jcookems Dec 15, 2012
c192e96
add protection key id to content key implementation.
Dec 17, 2012
c3404df
let the encryption integration test pass.
Dec 17, 2012
ad4570e
remove unused code.
Dec 17, 2012
f7f032e
unmarshall error details correctly.
Dec 17, 2012
53b73c6
self code review.
Dec 17, 2012
50fe300
remove task delete method
Dec 17, 2012
36542aa
Merge pull request #66 from gcheng/bugs
Dec 18, 2012
9d189ef
address code review feedback.
Dec 18, 2012
ac6f67e
Merge pull request #56 from gcheng/security
Dec 18, 2012
9a0115a
Merge pull request #563 from gcheng/dev
Dec 18, 2012
161c182
Merge pull request #67 from WindowsAzure/dev
Dec 18, 2012
f6a3bf5
remove documentation for unused parameter.
Dec 18, 2012
1bdbc7c
initial check in for remaining model unit tests.
Dec 18, 2012
7a92e9e
Merge pull request #68 from gcheng/blobcontainer
Dec 18, 2012
240e522
key in more unit tests
Dec 19, 2012
6861516
Merge branch 'dev' of https://github.com/gcheng/azure-sdk-for-java-pr…
Dec 19, 2012
2811704
Completes the unit test for task info class.
Dec 19, 2012
87dcf54
update task entity test
Dec 19, 2012
eca4741
fix broken unit tests
Dec 19, 2012
af0855a
fix a broken unit test.
Dec 19, 2012
96bf978
Adding Task integration tests
jcookems Dec 19, 2012
6c1925f
Fix #568
jcookems Dec 19, 2012
85e893b
Fix #569
jcookems Dec 19, 2012
d09c8f0
Promoting some Job method to base for use by Task tests
jcookems Dec 19, 2012
63cc563
Update Job cleanup code to wait until jobs can be deleted.
jcookems Dec 20, 2012
f6359cc
fix broken unit tests.
Dec 20, 2012
a882a64
Merge pull request #69 from gcheng/bugs
Dec 20, 2012
2fe9360
Merge pull request #571 from gcheng/dev
Dec 20, 2012
a744d2f
Merge pull request #18 from jcookems/taskTests_Fix568_Fix569
jcookems Dec 20, 2012
b49d5f3
Merge pull request #572 from jcookems/dev
jcookems Dec 20, 2012
be47bb5
Update the encryption scenario test to validate that the server can c…
jcookems Dec 22, 2012
f88154a
initial check in for processing the response item.
Jan 3, 2013
1dc4905
clean up the code.
Jan 3, 2013
02cf9f9
Merge branch 'dev' of https://github.com/gcheng/azure-sdk-for-java-pr…
Jan 3, 2013
95b5c1b
initial check in for non-nullable properties.
Jan 3, 2013
b515da0
remove unused properties.
Jan 3, 2013
67f183d
remove linkinfo properties
Jan 3, 2013
9152051
parameter name in the content key should be camel cased.
Jan 4, 2013
443ee64
entity link operation policheck issue.
Jan 4, 2013
a41d809
Merge pull request #73 from gcheng/linkinfo
Jan 4, 2013
f914116
Merge pull request #578 from gcheng/dev
Jan 4, 2013
9a08f79
Merge pull request #76 from WindowsAzure/dev
Jan 4, 2013
f67a733
fix the minor javadoc udpate for media service
Jan 5, 2013
b744e44
double retry count to wait a little bit longer.
Jan 5, 2013
69aa511
stop adding https to media service uri.
Jan 5, 2013
1b0c74e
Fixing unclear comment and variable name
jcookems Jan 7, 2013
c77f402
Merge pull request #19 from jcookems/encTest
jcookems Jan 7, 2013
5878861
Merge pull request #583 from jcookems/dev
jcookems Jan 7, 2013
354ef2a
Merge pull request #77 from gcheng/javadoc
Jan 7, 2013
9177463
Merge pull request #71 from gcheng/processresponse
Jan 7, 2013
b392324
Merge pull request #72 from gcheng/nullableproperty
Jan 7, 2013
be90395
Merge pull request #584 from gcheng/dev
Jan 7, 2013
66360c4
fix a broken unit test
Jan 7, 2013
01df851
Merge pull request #80 from gcheng/testfailure
Jan 7, 2013
d7c082b
Merge pull request #585 from gcheng/dev
Jan 7, 2013
69d8659
Merge pull request #78 from gcheng/failedunittest
Jan 7, 2013
88d06de
Merge pull request #79 from gcheng/configupdate
Jan 7, 2013
01c4ec0
Merge pull request #74 from gcheng/camelCase
Jan 7, 2013
d5664a7
Merge pull request #586 from gcheng/dev
Jan 7, 2013
048b12e
a missed file.
Jan 7, 2013
ccb2460
a missed unit test file.
Jan 7, 2013
032c15b
Merge pull request #81 from gcheng/dev
Jan 7, 2013
beab3ca
code review feedback.
Jan 7, 2013
5b6a9cf
Merge pull request #75 from gcheng/policheck
Jan 7, 2013
a90fe56
fix the policheck issue for README.md
Jan 7, 2013
0f400b3
Merge pull request #590 from gcheng/dev
Jan 8, 2013
64c089a
Merge pull request #82 from gcheng/policheck
Jan 8, 2013
c7fa5b6
Merge pull request #591 from gcheng/dev
Jan 8, 2013
d5d8506
convert to dev style java doc for writeable blob container contract.
Jan 8, 2013
4ed9259
Merge pull request #83 from gcheng/writeblobjavadoc
Jan 8, 2013
fe78260
Merge pull request #592 from gcheng/dev
Jan 8, 2013
5d4e644
Merge branch 'dev' of github.com:jcookems/azure-sdk-for-java-pr into dev
jcookems Jan 8, 2013
a190c0b
Merge pull request #594 from jcookems/dev
jcookems Jan 8, 2013
9958ed2
Cleanup TODO for AssetInfo
jcookems Jan 8, 2013
8435e5e
Removing TODO: Auto-generated Javadoc
jcookems Jan 8, 2013
1e0beaa
Remove TODO in AccessPolicyIntegrationTest, because the suggestion is…
jcookems Jan 8, 2013
f86ea9c
Remove TODO in JobIntegration test by adding validation for the numbe…
jcookems Jan 8, 2013
c07e6f7
Removing suggestion for where to add tests for future features. We sh…
jcookems Jan 8, 2013
6460f54
Merge pull request #21 from jcookems/fix593
jcookems Jan 9, 2013
2408048
Merge pull request #595 from jcookems/dev
jcookems Jan 9, 2013
3f48c87
Add code to cancel current jobs before running the test where the job…
jcookems Jan 9, 2013
1972fff
Merge pull request #23 from jcookems/fix581
jcookems Jan 9, 2013
9a0d6fb
Merge pull request #596 from jcookems/dev
jcookems Jan 9, 2013
476b705
initial check in for refactoring of action
Jan 9, 2013
520185b
update on the action DCR.
Jan 9, 2013
582439f
rename DefaultEntityTypeActionOperation
Jan 9, 2013
e15f49f
update the entity type action operation.
Jan 9, 2013
aa8609b
final touch on the action DCR.
Jan 9, 2013
681f13e
suppress the warnings.
Jan 9, 2013
811ff73
Merge pull request #87 from WindowsAzure/dev
Jan 9, 2013
22405d7
Merge branch 'dev' of https://github.com/gcheng/azure-sdk-for-java-pr…
Jan 9, 2013
2e24000
suppress warning after code merge.
Jan 9, 2013
0953d34
remove dates from the copyright.
Jan 9, 2013
2ba8f9b
remove 2013 from the copyright
Jan 9, 2013
2499d0f
add copy right header for the following files.
Jan 9, 2013
9b33725
code review feedback for removing warnings.
Jan 9, 2013
b29d50d
Merge pull request #86 from gcheng/nowarnings
Jan 9, 2013
423937d
Merge pull request #597 from gcheng/dev
Jan 9, 2013
9d5b720
Make LinkInfo generic for type safety
Dec 15, 2012
7ff6ddb
revert the changes for autogenerated files.
Jan 9, 2013
d30e709
add the copy right header for all the files.
Jan 9, 2013
31e4afd
Merge pull request #90 from gcheng/getcopyrights
Jan 9, 2013
e572a07
Merge pull request #598 from gcheng/dev
Jan 9, 2013
73a0309
Merge pull request #92 from gcheng/dev
Jan 9, 2013
452e007
Fixes for StatusLine resourse-leak warning.
jcookems Jan 9, 2013
076e66e
remove all the dates
Jan 9, 2013
c9c4c06
Merge branch 'nodate' of https://github.com/gcheng/azure-sdk-for-java…
Jan 9, 2013
83e7de1
Merge pull request #89 from gcheng/nodate
Jan 9, 2013
83f07a9
Merge pull request #599 from gcheng/dev
Jan 9, 2013
2330429
Restructure try-catches to have only one catch.
jcookems Jan 9, 2013
c31e52e
Reverting some now unneeded changes
jcookems Jan 9, 2013
5b1f104
update remove date from pom file.
Jan 9, 2013
6dbfd56
Merge pull request #93 from gcheng/nodate
Jan 9, 2013
76e9a7a
Merge pull request #600 from gcheng/dev
Jan 9, 2013
c6ad717
Merge pull request #24 from jcookems/fix520
jcookems Jan 9, 2013
55cb8e3
Merge pull request #601 from jcookems/dev
jcookems Jan 9, 2013
c66d567
Code review feedback. Removed todo, removed getLinks method.
Jan 9, 2013
079d78e
Merge pull request #39 from christav/type-safe-links
Jan 9, 2013
413753a
Merge pull request #602 from christav/dev
Jan 9, 2013
1a1717e
Merge pull request #94 from WindowsAzure/dev
Jan 9, 2013
fd3b016
Merge branch 'dev' of https://github.com/gcheng/azure-sdk-for-java-pr…
Jan 9, 2013
9f0b32f
Merge pull request #85 from gcheng/betteraction
Jan 9, 2013
f5c36ad
update tests for linkinfo
Jan 9, 2013
a8b26d2
Merge pull request #184 from justinyu/master
jcookems Jan 9, 2013
6ef0e49
Merge pull request #95 from gcheng/betteraction
Jan 9, 2013
6bd41af
Merge pull request #604 from gcheng/dev
Jan 10, 2013
81c5831
Remove unneeded casts to string from action
jcookems Jan 10, 2013
11e5830
Fix test warnings
jcookems Jan 10, 2013
c7028bd
Merge pull request #25 from jcookems/fix577
jcookems Jan 10, 2013
c33b704
Merge pull request #606 from jcookems/dev
jcookems Jan 10, 2013
97fe653
Fix TODOs in scenario tests.
jcookems Jan 9, 2013
509942b
Simplifying the wrapper somewhat.
jcookems Jan 9, 2013
ef728d0
Update to return file names with the asset file info.
jcookems Jan 10, 2013
0077ba0
Update tests to not rely on intermediate asset file URLs
jcookems Jan 10, 2013
0a36968
Renamed ...media.implementation.entities to ...media.entityoperations
Jan 10, 2013
6031c32
Merge pull request #40 from christav/package-rename-517
Jan 10, 2013
410e861
Merge pull request #608 from christav/dev
Jan 10, 2013
75e4a80
Updating task to change type of file from MP4 to WMV
jcookems Jan 11, 2013
5702ea8
Remove hacky `constructUrlFromLocatorAndFileName` in favor of using l…
jcookems Jan 11, 2013
2f81d3e
Adding version ot the `getMediaProcessorIdByName` method, because pro…
jcookems Jan 11, 2013
9daaf47
Merge pull request #96 from WindowsAzure/dev
Jan 11, 2013
d0e6484
Merge branch 'dev' of github.com:WindowsAzure/azure-sdk-for-java into…
jcookems Jan 11, 2013
a7df73a
Updating copyright section for parity with the rest of the code.
jcookems Jan 11, 2013
08504f7
Merge pull request #27 from jcookems/pullFromPublic
jcookems Jan 11, 2013
d3ac77b
get rid of the multivalued map overload for list.
Jan 11, 2013
e982438
update tests to remove redundant variables
Jan 11, 2013
e827e13
Fix code review feedback.
jcookems Jan 11, 2013
66d1785
Merge pull request #26 from jcookems/testEnhancements
jcookems Jan 11, 2013
6f0f8bd
Merge pull request #610 from jcookems/dev
jcookems Jan 11, 2013
5c2a242
Merge pull request #97 from gcheng/assetfilelist
Jan 11, 2013
0c279ea
Merge pull request #611 from gcheng/dev
Jan 11, 2013
6500348
Removing unused MultivaluedMap references in tests
jcookems Jan 14, 2013
3ee1e09
Merge pull request #28 from jcookems/fix609
jcookems Jan 14, 2013
993b3b4
Merge pull request #613 from jcookems/dev
jcookems Jan 14, 2013
4e49db0
Fix testCurrentOperationByteCount test race condition
Jan 14, 2013
182b551
updating Changelog, pom and Readme for 0.4.0 release
joostdenijs Jan 14, 2013
feac891
remove author from the headers of the file.
Jan 14, 2013
5507198
Merge pull request #198 from joeg/dev
jcookems Jan 14, 2013
a8a893a
Merge branch 'dev' of github.com:WindowsAzure/azure-sdk-for-java into…
jcookems Jan 14, 2013
d05dec3
Merge pull request #98 from gcheng/noauthor
Jan 14, 2013
f8f9051
Merge pull request #616 from gcheng/dev
Jan 14, 2013
5498cbf
Merge pull request #29 from jcookems/fromPublic
jcookems Jan 14, 2013
adc06f7
Merge pull request #617 from jcookems/dev
jcookems Jan 14, 2013
9077d14
updating Changelog, pom and Readme for 0.4.0 release with storage tea…
joostdenijs Jan 14, 2013
ae3d468
fixing issues on the pull request
joostdenijs Jan 14, 2013
f8dd460
Merge pull request #615 from joostdenijs/040release
jcookems Jan 14, 2013
44f12ed
fixing version in README
joostdenijs Jan 15, 2013
9f2a739
Merge pull request #621 from joostdenijs/minorreadmefix
jcookems Jan 15, 2013
fdfdaed
Replace "magic" ids with a named constant
jcookems Jan 16, 2013
f6e6b72
Merge pull request #30 from jcookems/fix622
jcookems Jan 16, 2013
a196e23
Merge pull request #623 from jcookems/dev
jcookems Jan 16, 2013
b0d834e
Remove wrapper code that corresponds to non-existant processors
jcookems Jan 16, 2013
15ae8a7
Merge pull request #31 from jcookems/fix622
jcookems Jan 16, 2013
c9fe420
Merge pull request #624 from jcookems/dev
jcookems Jan 16, 2013
8cf7681
Merge pull request #201 from joostdenijs/040release
jcookems Jan 18, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -337,7 +337,7 @@ public void canGetParentBackFromAsset() throws ServiceException, InterruptedExce

String jobName = testJobPrefix + "createJobSuccess";
CreateBatchOperation taskCreator = Task
.create("nb:mpid:UUID:2f381738-c504-4e4a-a38e-d199e207fcd5",
.create(MEDIA_ENCODER_MEDIA_PROCESSOR_2_2_0_0_ID,
"<taskBody>" + "<inputAsset>JobInputAsset(0)</inputAsset>"
+ "<outputAsset>JobOutputAsset(0)</outputAsset>" + "</taskBody>")
.setConfiguration("H.264 256k DSL CBR").setName("My encoding Task");
Original file line number Diff line number Diff line change
@@ -63,6 +63,8 @@ public abstract class IntegrationTestBase {
protected static final String validButNonexistAccessPolicyId = "nb:pid:UUID:38dcb3a0-ef64-4ad0-bbb5-67a14c6df2f7";
protected static final String validButNonexistLocatorId = "nb:lid:UUID:92a70402-fca9-4aa3-80d7-d4de3792a27a";

protected static final String MEDIA_ENCODER_MEDIA_PROCESSOR_2_2_0_0_ID = "nb:mpid:UUID:70bdc2c3-ebf4-42a9-8542-5afc1e55d217";

protected static final String invalidId = "notAValidId";

@Rule
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ private JobInfo createJob(String name) throws ServiceException {

private CreateBatchOperation getTaskCreator(int outputAssetPosition) {
return Task
.create("nb:mpid:UUID:2f381738-c504-4e4a-a38e-d199e207fcd5",
.create(MEDIA_ENCODER_MEDIA_PROCESSOR_2_2_0_0_ID,
"<taskBody>" + "<inputAsset>JobInputAsset(0)</inputAsset>" + "<outputAsset>JobOutputAsset("
+ outputAssetPosition + ")</outputAsset>" + "</taskBody>")
.setConfiguration("H.264 256k DSL CBR").setName("My encoding Task");
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@ public class TaskIntegrationTest extends IntegrationTestBase {
private static AssetInfo assetInfo;
private Creator jobCreator;

private static final String commonMediaProcessorId = "nb:mpid:UUID:2f381738-c504-4e4a-a38e-d199e207fcd5";
private static final String commonConfiguration = "H.264 256k DSL CBR";

@BeforeClass
@@ -66,7 +65,7 @@ public void createTaskSuccess() throws ServiceException, UnsupportedEncodingExce
// Arrange

// Required
String mediaProcessorId = commonMediaProcessorId;
String mediaProcessorId = MEDIA_ENCODER_MEDIA_PROCESSOR_2_2_0_0_ID;
String taskBody = constructTaskBody(0);

// Optional parameters
@@ -102,7 +101,7 @@ public void createTwoTasksSuccess() throws ServiceException {
// Arrange

// Required
String mediaProcessorId = commonMediaProcessorId;
String mediaProcessorId = MEDIA_ENCODER_MEDIA_PROCESSOR_2_2_0_0_ID;
String[] taskBodies = new String[] { constructTaskBody(0), constructTaskBody(1) };

// Optional parameters
@@ -136,7 +135,7 @@ public void createTwoTasksSuccess() throws ServiceException {
@Test
public void canListTasksWithOptions() throws ServiceException {
// Arrange
String mediaProcessorId = commonMediaProcessorId;
String mediaProcessorId = MEDIA_ENCODER_MEDIA_PROCESSOR_2_2_0_0_ID;
String configuration = commonConfiguration;
String[] taskNameSuffixes = new String[] { "A", "B", "C", "D" };
String baseName = "My encoding Task " + UUID.randomUUID().toString();
@@ -163,7 +162,7 @@ public void canListTasksWithOptions() throws ServiceException {
@Test
public void cancelTaskSuccess() throws ServiceException, InterruptedException {
// Arrange
String mediaProcessorId = commonMediaProcessorId;
String mediaProcessorId = MEDIA_ENCODER_MEDIA_PROCESSOR_2_2_0_0_ID;
String taskBody = constructTaskBody(0);
String configuration = commonConfiguration;
String name = "My encoding Task " + UUID.randomUUID().toString();
Original file line number Diff line number Diff line change
@@ -313,15 +313,15 @@ public Task.CreateBatchOperation createTaskOptions(String taskName, int inputAss
String configuration = null;
switch (encoderType) {
case Mp4ToSmoothStream:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_MP4_TO_SMOOTH_STREAMS, "2.1.0.0");
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_MP4_TO_SMOOTH_STREAMS, "2.2.0.0");
configuration = configMp4ToSmoothStreams;
break;
case SmoothStreamsToHls:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_SMOOTH_STREAMS_TO_HLS, "2.1.0.0");
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_SMOOTH_STREAMS_TO_HLS, "2.2.0.0");
configuration = configSmoothStreamsToAppleHttpLiveStreams;
break;
case WindowsAzureMediaEncoder:
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_WINDOWS_AZURE_MEDIA_ENCODER, "2.1.1.0");
processor = getMediaProcessorIdByName(MEDIA_PROCESSOR_WINDOWS_AZURE_MEDIA_ENCODER, "2.2.0.0");
// Full list of configurations strings for version 2.1 is at:
// http://msdn.microsoft.com/en-us/library/jj129582.aspx
configuration = "VC1 Broadband SD 4x3";