Skip to content

Commit e6249b0

Browse files
committed
Updates to support the split repo
1 parent 99982de commit e6249b0

File tree

252 files changed

+102884
-28
lines changed

Some content is hidden

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

252 files changed

+102884
-28
lines changed

Diff for: .gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
node_modules
2-
dist
3-
dist.*
42
.tmp
53
.sass-cache
64
.bundle

Diff for: LICENSE

+191
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
Copyright 2014 Red Hat, Inc.
180+
181+
Licensed under the Apache License, Version 2.0 (the "License");
182+
you may not use this file except in compliance with the License.
183+
You may obtain a copy of the License at
184+
185+
http://www.apache.org/licenses/LICENSE-2.0
186+
187+
Unless required by applicable law or agreed to in writing, software
188+
distributed under the License is distributed on an "AS IS" BASIS,
189+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
190+
See the License for the specific language governing permissions and
191+
limitations under the License.

Diff for: README.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
OpenShift 3 Static Assets
1+
OpenShift 3 Management Console
22
=========================
3-
The static assets for OpenShift v3. This includes the web console.
3+
The management console for [OpenShift Origin](https://github.com/openshift/origin) v3.
44

55
Contributing
66
------------
@@ -11,15 +11,15 @@ Contributing
1111
3. Install [ruby](https://www.ruby-lang.org/en/)
1212
4. Install bundler `gem install bundler`
1313
5. Install [Go](https://golang.org/dl/) per [steps 1 - 3](https://github.com/openshift/origin/blob/master/CONTRIBUTING.adoc#develop-locally-on-your-host)
14-
6. Install dev dependencies by running `hack/install-assets.sh`
15-
7. Launch the console and start watching for asset changes by running `hack/serve-local-assets.sh`. This should open <https://localhost:9000/> in your default browser.
14+
6. Install dev dependencies by running `hack/install-deps.sh`
15+
7. Launch the console and start watching for asset changes by running `grunt serve`. This should open <https://localhost:9000/> in your default browser.
1616

1717
Note: If you see an ENOSPC error, you may need to increase the number of files your user can watch by running this command:
1818

1919
```
2020
echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
2121
```
22-
8. Accept the self-signed certificate for the web console. (For Chrome on OS X, import `assets/server.crt` into Keychain Access or accept the web console certificate in Safari.)
22+
8. Accept the self-signed certificate for the web console. (For Chrome on OS X, import `server.crt` into Keychain Access or accept the web console certificate in Safari.)
2323
2424
#### Enable / disable console log output
2525
@@ -45,18 +45,17 @@ Note: currently most of our logging either goes to INFO or ERROR
4545
4646
#### Local configuration
4747
48-
`assets/app/config.js` is the default configuration file for web console
48+
`app/config.js` is the default configuration file for web console
4949
development. If you need to change the configuration, for example, to point to
50-
a different API server, copy `assets/app/config.js` to
51-
`assets/app/config.local.js` and edit the copy. `assets/app/config.local.js` is
50+
a different API server, copy `app/config.js` to
51+
`app/config.local.js` and edit the copy. `app/config.local.js` is
5252
not tracked and will be used instead if it exists.
5353
5454
#### Before opening a pull request
55-
1. If needed, run `hack/build-assets.sh` to update bindata.go
56-
2. Run the spec tests with `hack/test-assets.sh`
57-
3. Run the integrations tests (your api server must be running). cd into the assets directory and run `grunt test-integration --suite rest_api`
58-
4. (Optional) Run the end to end tests with `TEST_ASSETS=true hack/test-end-to-end.sh`
59-
5. Rebase and squash changes to a single commit
55+
1. If needed, run `grunt build` to update the files under the dist directory
56+
2. Run the spec tests with `grunt test`
57+
3. Run the integrations tests (your api server must be running) `grunt test-integration`
58+
4. Rebase and squash changes to a single commit
6059
6160
Note: in order to run the end to end tests you must have [Chrome](http://www.google.com/chrome/) and [chromedriver](https://sites.google.com/a/chromium.org/chromedriver/) installed. The script below will set this up for you on linux systems.
6261
@@ -80,19 +79,20 @@ chmod 755 /usr/bin/chromedriver
8079
```
8180
8281
#### Production builds
83-
1. Make sure all dev dependencies are up to date by running `hack/install-assets.sh`
84-
2. Run `hack/build-assets.sh`
85-
3. Run `hack/build-go.sh`
82+
1. Make sure all dev dependencies are up to date by running `hack/install-deps.sh`
83+
2. Run `grunt build`
84+
3. TODO - run script to build bindata.go from the dist in this repo
85+
4. In your origin repo run `hack/build-go.sh`
8686
8787
The assets served by the OpenShift all-in-one server will now be up to date. By default the assets are served from [http://localhost:8091](http://localhost:8091)
8888
89-
#### Debugging Travis failures
90-
If Travis complains that bindata.go is different than the committed version, ensure the committed version is correct:
89+
#### Debugging dist diff failures
90+
If Jenkins complains that the built dist files are different than the committed version, ensure the committed version is correct:
9191
92-
1. Run `hack/clean-assets.sh`
93-
2. Run `hack/install-assets.sh`
94-
3. Run `hack/build-assets.sh`
95-
4. If bindata.go is changed, add it to your commit and re-push
92+
1. Run `hack/clean-deps.sh`
93+
2. Run `hack/install-deps.sh`
94+
3. Run `grunt build`
95+
4. If anything under dist or dist.java has changed, add it to your commit and re-push
9696
9797
Architecture
9898
------------

Diff for: dist.java/java/404.html

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<title>openshift-jvm</title>
6+
<base href="/">
7+
<meta charset="UTF8">
8+
9+
<link rel="stylesheet" href="style.css"/>
10+
11+
</head>
12+
13+
<body ng-controller="OpenshiftJvm.MainController">
14+
<nav class="navbar navbar-default navbar-fixed-top navbar-pf" role="navigation" ng-cloak>
15+
<div class="navbar-header">
16+
<span class="navbar-brand">
17+
<img src="img/logo-origin-thin.svg">
18+
</span>
19+
</div>
20+
<ul class="nav navbar-nav navbar-utility">
21+
<li class="dropdown">
22+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
23+
<span class="pficon pficon-user"></span>
24+
User <b class="caret"></b>
25+
</a>
26+
<ul class="dropdown-menu" hawtio-extension name="hawtio-user"></ul>
27+
</li>
28+
</ul>
29+
<div class="container-header">
30+
<h4>Connected to <span ng-bind="containerName"></span></h4>
31+
<a ng-show="goBack" href="" ng-click="goBack()"><i class="fa fa-arrow-left"></i> Back</a>
32+
</div>
33+
<ul class="nav navbar-nav navbar-primary" hawtio-main-nav></ul>
34+
<ul class="nav navbar-nav navbar-persistent" hawtio-sub-tabs></ul>
35+
</nav>
36+
37+
<div id="main" class="container-fluid ng-cloak" ng-controller="HawtioNav.ViewController">
38+
<div ng-include src="viewPartial"></div>
39+
</div>
40+
41+
<script src="libs-e486cb7a47.js"></script>
42+
43+
<!-- add any scripts under dist/ here -->
44+
<script src="app-ab9ba6f96c.js"></script>
45+
46+
</body>
47+
</html>

Diff for: dist.java/java/app-ab9ba6f96c.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist.java/java/favicon.ico

1.12 KB
Binary file not shown.

Diff for: dist.java/java/fonts/DroidSansMono-webfont.ttf

34.4 KB
Binary file not shown.

Diff for: dist.java/java/fonts/DroidSansMono-webfont.woff

21.5 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Bold-webfont.ttf

42.5 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Bold-webfont.woff

23.6 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-BoldItalic-webfont.ttf

45.5 KB
Binary file not shown.
24.9 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-ExtraBold-webfont.ttf

42.3 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-ExtraBold-webfont.woff

23.7 KB
Binary file not shown.
44.9 KB
Binary file not shown.
24.8 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Italic-webfont.ttf

46.7 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Italic-webfont.woff

25 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Light-webfont.ttf

40.6 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Light-webfont.woff

22.1 KB
Binary file not shown.
48.7 KB
Binary file not shown.
25.3 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Regular-webfont.ttf

41.3 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Regular-webfont.woff

22.7 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Semibold-webfont.ttf

41.1 KB
Binary file not shown.

Diff for: dist.java/java/fonts/OpenSans-Semibold-webfont.woff

22.9 KB
Binary file not shown.
47.3 KB
Binary file not shown.
25.2 KB
Binary file not shown.

Diff for: dist.java/java/fonts/PatternFlyIcons-webfont.ttf

12.7 KB
Binary file not shown.

Diff for: dist.java/java/fonts/PatternFlyIcons-webfont.woff

12.8 KB
Binary file not shown.

Diff for: dist.java/java/fonts/fontawesome-webfont.ttf

135 KB
Binary file not shown.

Diff for: dist.java/java/fonts/fontawesome-webfont.woff

79.4 KB
Binary file not shown.

Diff for: dist.java/java/fonts/fontawesome-webfont.woff2

63 KB
Binary file not shown.
44.3 KB
Binary file not shown.
22.9 KB
Binary file not shown.
17.6 KB
Binary file not shown.

Diff for: dist.java/java/img/ZeroClipboard.swf

6.43 KB
Binary file not shown.

0 commit comments

Comments
 (0)