Project

General

Profile

« Previous | Next » 

Revision 60955

[Trunk | Admin Tools]:
1. AdminToolsCheckDeployController.java:
a. In "hello()" method added @RequestMapping (except for existing ""), "/health_check".
b. Added method "checkEverything()" (/health_chech/advanced) only accessible by PORTAL ADMINS which checks connection with db and prints properties.
2. Layout.java: Commented all fields for layout configuration (e.g. mainColor, buttons,...) and added an Object layoutOptions which includes any required options.

View differences:

Layout.java
12 12
    @Id
13 13
    @JsonProperty("_id")
14 14
    private String id;
15
    private String mainColor;
16
    private String secondaryColor;
17
    private Panel panel;
18
    private Box box;
19
    private Links links;
20
    private Buttons buttons;
15
//    private String mainColor;
16
//    private String secondaryColor;
17
//    private Panel panel;
18
//    private Box box;
19
//    private Links links;
20
//    private Buttons buttons;
21 21

  
22 22
    private String portalPid;
23
    private Object layoutOptions;
23 24

  
24 25
    public Layout() { }
25 26

  
26 27
    public Layout(String id, String mainColor, String secondaryColor, Panel panel, Box box, Links links, Buttons buttons, String portalPid) {
27 28
        this.id = id;
28
        this.mainColor = mainColor;
29
        this.secondaryColor = secondaryColor;
30
        this.panel = panel;
31
        this.box = box;
32
        this.links = links;
33
        this.buttons = buttons;
29
//        this.mainColor = mainColor;
30
//        this.secondaryColor = secondaryColor;
31
//        this.panel = panel;
32
//        this.box = box;
33
//        this.links = links;
34
//        this.buttons = buttons;
34 35

  
35 36
        this.portalPid = portalPid;
36 37
    }
......
43 44
        this.id = id;
44 45
    }
45 46

  
46
    public String getMainColor() {
47
        return mainColor;
48
    }
47
//    public String getMainColor() {
48
//        return mainColor;
49
//    }
50
//
51
//    public void setMainColor(String mainColor) {
52
//        this.mainColor = mainColor;
53
//    }
54
//
55
//    public String getSecondaryColor() {
56
//        return secondaryColor;
57
//    }
58
//
59
//    public void setSecondaryColor(String secondaryColor) {
60
//        this.secondaryColor = secondaryColor;
61
//    }
62
//
63
//    public Panel getPanel() {
64
//        return panel;
65
//    }
66
//
67
//    public void setPanel(Panel panel) {
68
//        this.panel = panel;
69
//    }
70
//
71
//    public Box getBox() {
72
//        return box;
73
//    }
74
//
75
//    public void setBox(Box box) {
76
//        this.box = box;
77
//    }
78
//
79
//    public Links getLinks() {
80
//        return links;
81
//    }
82
//
83
//    public void setLinks(Links links) {
84
//        this.links = links;
85
//    }
86
//
87
//    public Buttons getButtons() {
88
//        return buttons;
89
//    }
90
//
91
//    public void setButtons(Buttons buttons) {
92
//        this.buttons = buttons;
93
//    }
49 94

  
50
    public void setMainColor(String mainColor) {
51
        this.mainColor = mainColor;
95
    public String getPortalPid() {
96
        return portalPid;
52 97
    }
53 98

  
54
    public String getSecondaryColor() {
55
        return secondaryColor;
99
    public void setPortalPid(String portalPid) {
100
        this.portalPid = portalPid;
56 101
    }
57 102

  
58
    public void setSecondaryColor(String secondaryColor) {
59
        this.secondaryColor = secondaryColor;
103
    public Object getLayoutOptions() {
104
        return layoutOptions;
60 105
    }
61 106

  
62
    public Panel getPanel() {
63
        return panel;
107
    public void setLayoutOptions(Object layoutOptions) {
108
        this.layoutOptions = layoutOptions;
64 109
    }
65

  
66
    public void setPanel(Panel panel) {
67
        this.panel = panel;
68
    }
69

  
70
    public Box getBox() {
71
        return box;
72
    }
73

  
74
    public void setBox(Box box) {
75
        this.box = box;
76
    }
77

  
78
    public Links getLinks() {
79
        return links;
80
    }
81

  
82
    public void setLinks(Links links) {
83
        this.links = links;
84
    }
85

  
86
    public Buttons getButtons() {
87
        return buttons;
88
    }
89

  
90
    public void setButtons(Buttons buttons) {
91
        this.buttons = buttons;
92
    }
93

  
94
    public String getPortalPid() {
95
        return portalPid;
96
    }
97

  
98
    public void setPortalPid(String portalPid) {
99
        this.portalPid = portalPid;
100
    }
101 110
}

Also available in: Unified diff