Skip to content

Commit 986ba8c

Browse files
fcamblorfcamblor
committed
Merge pull request #148 from fcamblor/webjars
Webjars support
2 parents a516b4e + 1fce9e3 commit 986ba8c

File tree

679 files changed

+186731
-80
lines changed

Some content is hidden

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

679 files changed

+186731
-80
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Here is a brief summary of each module:
6464
- `restx-specs-server`: Enables using RESTX specs as HTTP mocks (running a server serving spec files responses given spec files requests).
6565
- `restx-factory-testing`: A module dedicated to test `restx-factory` features involving annotation processing.
6666
- `restx-validation`: Bean validation support (based on `hibernate-validator` implementation) for POJOs BODY parameters
67+
- `restx-webjars`: Webjars support through urls like `/@/webjars/*`
6768

6869

6970
#### MongoDB support through Jongo API:

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
<module>restx-build-shell</module>
160160
<module>restx-specs-shell</module>
161161
<module>restx-validation</module>
162+
<module>restx-webjars</module>
162163
</modules>
163164

164165

‎restx-admin/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,10 @@
4343
<artifactId>restx-core-annotation-processor</artifactId>
4444
<version>${restx.version}</version>
4545
</dependency>
46+
<dependency>
47+
<groupId>io.restx</groupId>
48+
<artifactId>restx-webjars</artifactId>
49+
<version>${restx.version}</version>
50+
</dependency>
4651
</dependencies>
4752
</project>

‎restx-admin/src/main/resources/restx/admin/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ <h1>Welcome to RESTX admin console</h1>
5050
</div>
5151
</div>
5252

53-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
54-
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
55-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.min.js"></script>
56-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular-resource.min.js"></script>
57-
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js"></script>
53+
<script src="../webjars/jquery/1.9.1/jquery.min.js"></script>
54+
<script src="../webjars/bootstrap/2.3.0/js/bootstrap.min.js"></script>
55+
<script src="../webjars/angularjs/1.0.8/angular.min.js"></script>
56+
<script src="../webjars/angularjs/1.0.8/angular-resource.min.js"></script>
57+
<script src="../webjars/underscorejs/1.4.4/underscore.min.js"></script>
5858

5959
<script type="text/javascript">angular.module('admin', ['ngResource'])</script>
6060
<script src="js/securityHandling.js"></script>

‎restx-admin/src/main/resources/restx/admin/login.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
</div>
5050
</div>
5151

52-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
53-
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
54-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.min.js"></script>
55-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular-resource.min.js"></script>
56-
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js"></script>
52+
<script src="../webjars/jquery/1.9.1/jquery.min.js"></script>
53+
<script src="../webjars/bootstrap/2.3.0/js/bootstrap.min.js"></script>
54+
<script src="../webjars/angularjs/1.0.8/angular.min.js"></script>
55+
<script src="../webjars/angularjs/1.0.8/angular-resource.min.js"></script>
56+
<script src="../webjars/underscorejs/1.4.4/underscore.min.js"></script>
5757

5858
<script type="text/javascript">angular.module('admin', ['ngResource'])</script>
5959
<script src="js/Spark-md5.min.js"></script>

‎restx-admin/src/main/resources/restx/config/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
</div>
6666
</div>
6767

68-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
69-
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
70-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.min.js"></script>
71-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular-resource.min.js"></script>
72-
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js"></script>
68+
<script src="../../webjars/jquery/1.9.1/jquery.min.js"></script>
69+
<script src="../../webjars/bootstrap/2.3.0/js/bootstrap.min.js"></script>
70+
<script src="../../webjars/angularjs/1.0.8/angular.min.js"></script>
71+
<script src="../../webjars/angularjs/1.0.8/angular-resource.min.js"></script>
72+
<script src="../../webjars/underscorejs/1.4.4/underscore.min.js"></script>
7373

7474
<script src="js/app.js"></script>
7575
<script src="../js/securityHandling.js"></script>

‎restx-admin/src/main/resources/restx/exceptions/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
</div>
6767
</div>
6868

69-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
70-
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
71-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.min.js"></script>
72-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular-resource.min.js"></script>
73-
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js"></script>
69+
<script src="../../webjars/jquery/1.9.1/jquery.min.js"></script>
70+
<script src="../../webjars/bootstrap/2.3.0/js/bootstrap.min.js"></script>
71+
<script src="../../webjars/angularjs/1.0.8/angular.min.js"></script>
72+
<script src="../../webjars/angularjs/1.0.8/angular-resource.min.js"></script>
73+
<script src="../../webjars/underscorejs/1.4.4/underscore.min.js"></script>
7474

7575
<script src="js/app.js"></script>
7676
<script src="../js/securityHandling.js"></script>

‎restx-admin/src/main/resources/restx/sources/index.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>RESTX :: Sources</title>
77
<link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css">
8-
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.min.css">
8+
<link rel="stylesheet" type="text/css" href="lib/codemirror-3.20/codemirror.min.css">
99
<link rel="stylesheet" type="text/css" href="../css/alertify.core.css" />
1010
<link rel="stylesheet" type="text/css" href="../css/alertify.default.css" />
1111
<link rel="stylesheet" type="text/css" href="../css/admin.css"/>
@@ -54,17 +54,17 @@ <h1>{{fileName}}</h1>
5454
<textarea ng-show="!isDirectory" ui-codemirror="editorOptions" ng-model="source"></textarea>
5555
</div>
5656

57-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
58-
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
59-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
60-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-resource.min.js"></script>
61-
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js"></script>
62-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.min.js"></script>
63-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/clike/clike.min.js"></script>
64-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/css/css.min.js"></script>
65-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/javascript/javascript.min.js"></script>
66-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/xml/xml.min.js"></script>
67-
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/yaml/yaml.min.js"></script>
57+
<script src="../../webjars/jquery/1.9.1/jquery.min.js"></script>
58+
<script src="../../webjars/bootstrap/2.3.0/js/bootstrap.min.js"></script>
59+
<script src="../../webjars/angularjs/1.2.9/angular.min.js"></script>
60+
<script src="../../webjars/angularjs/1.2.9/angular-resource.min.js"></script>
61+
<script src="../../webjars/underscorejs/1.4.4/underscore.min.js"></script>
62+
<script src="lib/codemirror-3.20/codemirror.min.js"></script>
63+
<script src="lib/codemirror-3.20/mode/clike/clike.min.js"></script>
64+
<script src="lib/codemirror-3.20/mode/css/css.min.js"></script>
65+
<script src="lib/codemirror-3.20/mode/javascript/javascript.min.js"></script>
66+
<script src="lib/codemirror-3.20/mode/xml/xml.min.js"></script>
67+
<script src="lib/codemirror-3.20/mode/yaml/yaml.min.js"></script>
6868
<script src="js/ui-codemirror.js"></script>
6969
<script src="../js/alertify.min.js"></script>
7070

‎restx-admin/src/main/resources/restx/sources/lib/codemirror-3.20/codemirror.min.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎restx-admin/src/main/resources/restx/sources/lib/codemirror-3.20/codemirror.min.js‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)