Skip to content

Commit 72b1b71

Browse files
joshistejoshiste
committed
Merge pull request #29 from joshiste/separate-ui
Separate the UI from the server
2 parents b1af967 + 9b6371e commit 72b1b71

File tree

84 files changed

+18621
-1094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+18621
-1094
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
language: java
2+
3+
before_install:
4+
- "export DISPLAY=:99.0"
5+
- "sh -e /etc/init.d/xvfb start"
6+
27
script: mvn clean install

‎README.md‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,24 @@ This application provides a simple GUI to administrate Spring Boot applications
2121

2222
#### Server application
2323
Add the following dependency to your pom.xml.
24-
```
24+
```xml
2525
<dependency>
2626
<groupId>de.codecentric</groupId>
2727
<artifactId>spring-boot-admin-server</artifactId>
28-
<version>1.1.0</version>
28+
<version>1.1.1</version>
29+
</dependency>
30+
```
31+
If you have built your own snapshot-release from git you have to enable the UI seperately by adding one additional dependency
32+
```xml
33+
<dependency>
34+
<groupId>de.codecentric</groupId>
35+
<artifactId>spring-boot-admin-server-ui</artifactId>
36+
<version>1.1.1</version>
2937
</dependency>
3038
```
3139

3240
Create the Spring Boot Admin Server with only one single Annotation.
33-
```
41+
```java
3442
@Configuration
3543
@EnableAutoConfiguration
3644
@EnableAdminServer
@@ -47,11 +55,11 @@ For configuring Hazelcast support see [spring-boot-admin-server](https://github.
4755

4856
#### Client applications
4957
Each application that want to register itself to the admin application has to include the [spring-boot-starter-admin-client](https://github.com/codecentric/spring-boot-admin/tree/master/spring-boot-starter-admin-client) as dependency. This starter JAR includes some [AutoConfiguration](http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#using-boot-auto-configuration "Spring Boot documentation") features that includes registering tasks, controller, etc.
50-
```
58+
```xml
5159
<dependency>
5260
<groupId>de.codecentric</groupId>
5361
<artifactId>spring-boot-starter-admin-client</artifactId>
54-
<version>1.1.0</version>
62+
<version>1.1.1</version>
5563
</dependency>
5664
```
5765

@@ -86,6 +94,7 @@ For all configuration options see [spring-boot-starter-admin-client](https://git
8694
<img src="https://raw.githubusercontent.com/codecentric/spring-boot-admin/master/screenshot-jmx.png">
8795

8896
#### Build
97+
In order to build spring-boot-admin you need to have node.js and npm on your PATH.
8998

9099
```shell
91100
mvn clean package

‎pom.xml‎

Lines changed: 11 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,12 @@
1818
<properties>
1919
<spring-boot.version>1.1.9.RELEASE</spring-boot.version>
2020
<hazelcast.version>3.3.3</hazelcast.version>
21-
<bootstrap.version>2.3.2</bootstrap.version>
22-
<jquery.version>1.11.0</jquery.version>
23-
<angularjs.version>1.2.12</angularjs.version>
24-
<angular-ui-router.version>0.2.10-1</angular-ui-router.version>
25-
<angular-ui-bootstrap.version>0.8.0</angular-ui-bootstrap.version>
26-
<angularjs-nvd3-directives.version>0.0.7-1</angularjs-nvd3-directives.version>
27-
<d3js.version>3.4.11</d3js.version>
28-
<nvd3.version>1.1.15-beta</nvd3.version>
29-
<jolokia-js.version>1.2.2</jolokia-js.version>
3021
<main.basedir>${basedir}</main.basedir>
3122
<passphrase>${gpg.passphrase}</passphrase>
3223
</properties>
3324
<modules>
3425
<module>spring-boot-admin-server</module>
26+
<module>spring-boot-admin-server-ui</module>
3527
<module>spring-boot-admin-samples</module>
3628
<module>spring-boot-starter-admin-client</module>
3729
</modules>
@@ -113,6 +105,11 @@
113105
<artifactId>maven-surefire-plugin</artifactId>
114106
<version>2.17</version>
115107
</plugin>
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>exec-maven-plugin</artifactId>
111+
<version>1.3.2</version>
112+
</plugin>
116113
</plugins>
117114
</pluginManagement>
118115
</build>
@@ -163,6 +160,11 @@
163160
<artifactId>spring-boot-admin-server</artifactId>
164161
<version>1.1.1-SNAPSHOT</version>
165162
</dependency>
163+
<dependency>
164+
<groupId>de.codecentric</groupId>
165+
<artifactId>spring-boot-admin-server-ui</artifactId>
166+
<version>1.1.1-SNAPSHOT</version>
167+
</dependency>
166168
<dependency>
167169
<groupId>de.codecentric</groupId>
168170
<artifactId>spring-boot-starter-admin-client</artifactId>
@@ -198,51 +200,6 @@
198200
<artifactId>hazelcast-spring</artifactId>
199201
<version>${hazelcast.version}</version>
200202
</dependency>
201-
<dependency>
202-
<groupId>org.webjars</groupId>
203-
<artifactId>bootstrap</artifactId>
204-
<version>${bootstrap.version}</version>
205-
</dependency>
206-
<dependency>
207-
<groupId>org.webjars</groupId>
208-
<artifactId>jquery</artifactId>
209-
<version>${jquery.version}</version>
210-
</dependency>
211-
<dependency>
212-
<groupId>org.webjars</groupId>
213-
<artifactId>angularjs</artifactId>
214-
<version>${angularjs.version}</version>
215-
</dependency>
216-
<dependency>
217-
<groupId>org.webjars</groupId>
218-
<artifactId>angular-ui-router</artifactId>
219-
<version>${angular-ui-router.version}</version>
220-
</dependency>
221-
<dependency>
222-
<groupId>org.webjars</groupId>
223-
<artifactId>angular-ui-bootstrap</artifactId>
224-
<version>${angular-ui-bootstrap.version}</version>
225-
</dependency>
226-
<dependency>
227-
<groupId>org.webjars</groupId>
228-
<artifactId>angularjs-nvd3-directives</artifactId>
229-
<version>${angularjs-nvd3-directives.version}</version>
230-
</dependency>
231-
<dependency>
232-
<groupId>org.webjars</groupId>
233-
<artifactId>d3js</artifactId>
234-
<version>${d3js.version}</version>
235-
</dependency>
236-
<dependency>
237-
<groupId>org.webjars</groupId>
238-
<artifactId>nvd3</artifactId>
239-
<version>${nvd3.version}</version>
240-
</dependency>
241-
<dependency>
242-
<groupId>org.webjars</groupId>
243-
<artifactId>jolokia.js</artifactId>
244-
<version>${jolokia-js.version}</version>
245-
</dependency>
246203
<!-- Test -->
247204
<dependency>
248205
<groupId>junit</groupId>

‎spring-boot-admin-samples/spring-boot-admin-sample-hazelcast/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<groupId>de.codecentric</groupId>
1414
<artifactId>spring-boot-admin-server</artifactId>
1515
</dependency>
16+
<dependency>
17+
<groupId>de.codecentric</groupId>
18+
<artifactId>spring-boot-admin-server-ui</artifactId>
19+
</dependency>
1620
<dependency>
1721
<groupId>com.hazelcast</groupId>
1822
<artifactId>hazelcast</artifactId>

‎spring-boot-admin-samples/spring-boot-admin-sample/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<groupId>de.codecentric</groupId>
1414
<artifactId>spring-boot-admin-server</artifactId>
1515
</dependency>
16+
<dependency>
17+
<groupId>de.codecentric</groupId>
18+
<artifactId>spring-boot-admin-server-ui</artifactId>
19+
</dependency>
1620
</dependencies>
1721
<build>
1822
<finalName>${project.artifactId}</finalName>

‎spring-boot-admin-server-ui/.eslintrc‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"mocha": true,
5+
"node": true,
6+
"amd": false
7+
},
8+
"rules": {
9+
"no-alert": 2,
10+
"no-array-constructor": 2,
11+
"no-bitwise": 0,
12+
"no-caller": 2,
13+
"no-catch-shadow": 2,
14+
"no-comma-dangle": 0,
15+
"no-cond-assign": 2,
16+
"no-console": 2,
17+
"no-constant-condition": 2,
18+
"no-control-regex": 2,
19+
"no-debugger": 2,
20+
"no-delete-var": 2,
21+
"no-div-regex": 0,
22+
"no-dupe-keys": 2,
23+
"no-else-return": 0,
24+
"no-empty": 2,
25+
"no-empty-class": 2,
26+
"no-empty-label": 2,
27+
"no-eq-null": 0,
28+
"no-eval": 2,
29+
"no-ex-assign": 2,
30+
"no-extend-native": 2,
31+
"no-extra-boolean-cast": 2,
32+
"no-extra-parens": 0,
33+
"no-extra-semi": 2,
34+
"no-extra-strict": 2,
35+
"no-fallthrough": 2,
36+
"no-floating-decimal": 0,
37+
"no-func-assign": 2,
38+
"no-global-strict": 0,
39+
"no-implied-eval": 2,
40+
"no-invalid-regexp": 2,
41+
"no-iterator": 2,
42+
"no-label-var": 2,
43+
"no-labels": 2,
44+
"no-lone-blocks": 2,
45+
"no-lonely-if": 0,
46+
"no-loop-func": 2,
47+
"no-mixed-requires": [0, false],
48+
"no-multi-str": 2,
49+
"no-native-reassign": 2,
50+
"no-negated-in-lhs": 2,
51+
"no-nested-ternary": 0,
52+
"no-new": 2,
53+
"no-new-func": 2,
54+
"no-new-object": 2,
55+
"no-new-require": 0,
56+
"no-new-wrappers": 2,
57+
"no-obj-calls": 2,
58+
"no-octal": 2,
59+
"no-octal-escape": 2,
60+
"no-path-concat": 0,
61+
"no-plusplus": 0,
62+
"no-process-exit": 2,
63+
"no-proto": 2,
64+
"no-redeclare": 2,
65+
"no-regex-spaces": 2,
66+
"no-restricted-modules": 0,
67+
"no-return-assign": 2,
68+
"no-script-url": 2,
69+
"no-self-compare": 0,
70+
"no-sequences": 2,
71+
"no-shadow": 2,
72+
"no-shadow-restricted-names": 2,
73+
"no-spaced-func": 2,
74+
"no-space-before-semi": 2,
75+
"no-sparse-arrays": 2,
76+
"no-sync": 0,
77+
"no-ternary": 0,
78+
"no-undef": 2,
79+
"no-undef-init": 2,
80+
"no-underscore-dangle": 2,
81+
"no-unreachable": 2,
82+
"no-unused-expressions": 0,
83+
"no-unused-vars": [2, {"vars": "local", "args": "after-used"}],
84+
"no-use-before-define": 0,
85+
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
86+
"no-with": 2,
87+
"no-wrap-func": 2,
88+
"yoda": "never",
89+
90+
"block-scoped-var": 0,
91+
"brace-style": [0, "1tbs"],
92+
"camelcase": 2,
93+
"complexity": [0, 11],
94+
"consistent-return": 2,
95+
"consistent-this": [0, "that"],
96+
"curly": [2, "all"],
97+
"default-case": 0,
98+
"dot-notation": 2,
99+
"eqeqeq": 2,
100+
"func-names": 0,
101+
"func-style": [0, "declaration"],
102+
"guard-for-in": 0,
103+
"max-depth": [0, 4],
104+
"max-len": [0, 80, 4],
105+
"max-nested-callbacks": [0, 2],
106+
"max-params": [0, 3],
107+
"max-statements": [0, 10],
108+
"handle-callback-err": 0,
109+
"new-cap": 0,
110+
"new-parens": 2,
111+
"one-var": 0,
112+
"quote-props": 0,
113+
"quotes": [2, "single"],
114+
"radix": 0,
115+
"semi": 2,
116+
"sort-vars": 0,
117+
"space-after-keywords": [0, "always"],
118+
"space-in-brackets": [0, "never"],
119+
"space-infix-ops": 2,
120+
"space-return-throw-case": 2,
121+
"space-unary-word-ops": 0,
122+
"strict": 2,
123+
"use-isnan": 2,
124+
"valid-jsdoc": 0,
125+
"valid-typeof": 2,
126+
"wrap-iife": 0,
127+
"wrap-regex": 0
128+
},
129+
globals: {
130+
"browser": true,
131+
"by": true,
132+
"element": true,
133+
"expect": true,
134+
"protractor": true,
135+
"xdescribe": true,
136+
"xit": true
137+
}
138+
}

‎spring-boot-admin-server-ui/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/node_modules
2+
/node
3+
/target
4+
/.settings
5+
/.classpath
6+
/.project

‎spring-boot-admin-server-ui/README.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
spring-boot-admin-server-ui
2+
================================
3+
4+
This is the user-interface for the spring-boot-admin-server.
5+
There are neither configuration nor customization options.
6+
If you want to change something, copy this project and build your own static resources and ship 'em with your spring-boot-admin-server.
7+
8+
### Building this module
9+
The jar **can be build with Maven** with the maven-exec-plugin, node.js and npm must be installed on your machine and be on your $PATH.
10+
If you dont want to use the maven exec run the following commands:
11+
12+
### Build
13+
```shell
14+
npm install
15+
gulp
16+
```
17+
18+
### Run server (with watchify)
19+
```shell
20+
npm install
21+
gulp watch
22+
```
23+

0 commit comments

Comments
 (0)