You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/11/07 00:29:56 UTC
[14/22] incubator-slider git commit: SLIDER-964 AggregateConfResource
exports appconf under internal/
SLIDER-964 AggregateConfResource exports appconf under internal/
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ca43d1be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ca43d1be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ca43d1be
Branch: refs/heads/feature/SLIDER-82-pass-3.1
Commit: ca43d1bea353fe15057d24e71e569d43d2a98c1a
Parents: 07fb45d
Author: Steve Loughran <st...@apache.org>
Authored: Fri Nov 6 13:57:19 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Nov 6 13:57:19 2015 +0000
----------------------------------------------------------------------
.../web/rest/management/TestAMManagementWebServices.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ca43d1be/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
----------------------------------------------------------------------
diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
index 70a6bcb..44eb692 100644
--- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
+++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java
@@ -114,9 +114,10 @@ public class TestAMManagementWebServices extends JerseyTest {
try {
JsonSerDeser<ConfTree> confTreeJsonSerDeser = new JsonSerDeser<>(ConfTree.class);
AggregateConf aggregateConf = new AggregateConf(
- confTreeJsonSerDeser.fromResource(EXAMPLES + "internal.json"),
+ confTreeJsonSerDeser.fromResource(EXAMPLES + "resources.json"),
confTreeJsonSerDeser.fromResource(EXAMPLES + "app_configuration.json"),
- confTreeJsonSerDeser.fromResource(EXAMPLES + "resources.json"));
+ confTreeJsonSerDeser.fromResource(EXAMPLES + "internal.json")
+ );
aggregateConf.setName("test");
return aggregateConf;
} catch (IOException e) {