Skip to content

Commit b71acbc

Browse files
spark404spark404
committed
include db.properties
1 parent f11a163 commit b71acbc

5 files changed

Lines changed: 135 additions & 132 deletions

File tree

‎awsapi/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@
249249
<exclude>**/*.java</exclude>
250250
</excludes>
251251
</resource>
252+
<resource>
253+
<directory>../utils/conf/</directory>
254+
</resource>
252255
</resources>
253256
<plugins>
254257
<plugin>

‎console-proxy/certs/realhostip.csr‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
-----BEGIN NEW CERTIFICATE REQUEST-----
2-
MIICsDCCAZgCAQAwazELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlDdXBlcnRp
3-
bm8xDjAMBgNVBAoTBVZNT3BzMRAwDgYDVQQLEwdVbmtub3duMRkwFwYDVQQDDBAqLnJlYWxob3N0
4-
aXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0/QLRH7PrPyPEF6eq6wsNIj
5-
SdPhoLMmzR4XlPiaS9/SzE2cpAq2YWZ8g78HcQqDnxN/Emt9m2hyjXbPstkh5zDbDpMPDnDbnBxA
6-
V9RSKTgRqYfQ+sQvrpsfaHesTFhE1L+4+odrvlgtzoQTPHxwgaiIgKJd9fyJHKg8cbB5UPEv6An0
7-
5VyVGOmJ+tvDgNV4oynUZ2nVdIWfNvXL/z2SpY48EFE8q3dCh0HpLAR/mAGEqNiVJfHpDS7DovP3
8-
D7X6I55bc0SNRl4tGTjbPFZw8ydGtoKmWPrsZc/ghmy5xp5TeI/XAaRPjH1BPt+Q6tdtbE6bEoBf
9-
OTM/qVYZ9kut9wIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAF5lhhni9dW9MqSL2ixNbViPWpFS
10-
ecOggshYChJfZKrhsuZaDpumJ/+ebICS4zv/oxDwNLSmeAmydiaUQC9LFQEEwvPBYDTtTzwCrtwH
11-
yyFJQSm6pyeIBP/Bih/5hLW8JPm0bDbp5ldrHCDEgKQeeyQhyYOKFODkTuMLw+FLD+V86IVHxElL
12-
/urCRWyZEPwyMsgfsU6ywNX9XNShyk1uDHjFDE67sPhfw52ooxXrYQnBdTk+g0UXPbULzrCK/1kU
13-
fjRq347V9Fwi5NFyGADOaA+q6mtnlb1i3uH1n1YVUzevvpnIr3/RxPSYHB47Kj9iYKeDlYdTRHJy
14-
NpuvTfmQO2Y=
15-
-----END NEW CERTIFICATE REQUEST-----
1+
-----BEGIN NEW CERTIFICATE REQUEST-----
2+
MIICsDCCAZgCAQAwazELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlDdXBlcnRp
3+
bm8xDjAMBgNVBAoTBVZNT3BzMRAwDgYDVQQLEwdVbmtub3duMRkwFwYDVQQDDBAqLnJlYWxob3N0
4+
aXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0/QLRH7PrPyPEF6eq6wsNIj
5+
SdPhoLMmzR4XlPiaS9/SzE2cpAq2YWZ8g78HcQqDnxN/Emt9m2hyjXbPstkh5zDbDpMPDnDbnBxA
6+
V9RSKTgRqYfQ+sQvrpsfaHesTFhE1L+4+odrvlgtzoQTPHxwgaiIgKJd9fyJHKg8cbB5UPEv6An0
7+
5VyVGOmJ+tvDgNV4oynUZ2nVdIWfNvXL/z2SpY48EFE8q3dCh0HpLAR/mAGEqNiVJfHpDS7DovP3
8+
D7X6I55bc0SNRl4tGTjbPFZw8ydGtoKmWPrsZc/ghmy5xp5TeI/XAaRPjH1BPt+Q6tdtbE6bEoBf
9+
OTM/qVYZ9kut9wIDAQABoAAwDQYJKoZIhvcNAQEFBQADggEBAF5lhhni9dW9MqSL2ixNbViPWpFS
10+
ecOggshYChJfZKrhsuZaDpumJ/+ebICS4zv/oxDwNLSmeAmydiaUQC9LFQEEwvPBYDTtTzwCrtwH
11+
yyFJQSm6pyeIBP/Bih/5hLW8JPm0bDbp5ldrHCDEgKQeeyQhyYOKFODkTuMLw+FLD+V86IVHxElL
12+
/urCRWyZEPwyMsgfsU6ywNX9XNShyk1uDHjFDE67sPhfw52ooxXrYQnBdTk+g0UXPbULzrCK/1kU
13+
fjRq347V9Fwi5NFyGADOaA+q6mtnlb1i3uH1n1YVUzevvpnIr3/RxPSYHB47Kj9iYKeDlYdTRHJy
14+
NpuvTfmQO2Y=
15+
-----END NEW CERTIFICATE REQUEST-----

‎console-proxy/ui/viewer-bad-sid.ftl‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
19-
<html>
20-
<head>
21-
</head>
22-
<body>
23-
24-
<div id="main_panel" tabindex="1">
25-
<p>Unable to start console session as access is denied because of bad sid</p>
26-
</div>
27-
28-
</body>
29-
</html>
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<html>
20+
<head>
21+
</head>
22+
<body>
23+
24+
<div id="main_panel" tabindex="1">
25+
<p>Unable to start console session as access is denied because of bad sid</p>
26+
</div>
27+
28+
</body>
29+
</html>

‎console-proxy/ui/viewer-connect-failed.ftl‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
19-
<html>
20-
<head>
21-
</head>
22-
<body>
23-
24-
<div id="main_panel" tabindex="1">
25-
<p>Unable to start console session as connection is refused by the machine you are accessing</p>
26-
</div>
27-
28-
</body>
29-
</html>
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<html>
20+
<head>
21+
</head>
22+
<body>
23+
24+
<div id="main_panel" tabindex="1">
25+
<p>Unable to start console session as connection is refused by the machine you are accessing</p>
26+
</div>
27+
28+
</body>
29+
</html>

‎console-proxy/ui/viewer.ftl‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
19-
<html>
20-
<head>
21-
<script type="text/javascript" language="javascript" src="/resource/js/jquery.js"></script>
22-
<script type="text/javascript" language="javascript" src="/resource/js/ajaxviewer.js"></script>
23-
<script type="text/javascript" language="javascript" src="/resource/js/handler.js"></script>
24-
<link rel="stylesheet" type="text/css" href="/resource/css/ajaxviewer.css"></link>
25-
<title>${title}</title>
26-
</head>
27-
<body>
28-
<div id="toolbar">
29-
<ul>
30-
<li>
31-
<a href="#" onclick="javascript:sendCtrlAltDel();">
32-
<span><img align="left" src="/resource/images/cad.gif" alt="Ctrl-Alt-Del" />Ctrl-Alt-Del</span>
33-
</a>
34-
</li>
35-
<li>
36-
<a href="#" onclick="javascript:sendCtrlEsc();">
37-
<span><img align="left" src="/resource/images/winlog.png" alt="Ctrl-Esc" style="width:16px;height:16px"/>Ctrl-Esc</span>
38-
</a>
39-
</li>
40-
</ul>
41-
<span id="light" class="dark"></span>
42-
</div>
43-
44-
<div id="main_panel" tabindex="1"></div>
45-
46-
<script language="javascript">
47-
48-
var tileMap = [ ${tileSequence} ];
49-
var ajaxViewer = new AjaxViewer('main_panel', '${imgUrl}', '${updateUrl}', tileMap,
50-
${width}, ${height}, ${tileWidth}, ${tileHeight}, ${rawKeyboard});
51-
52-
$(function() {
53-
ajaxViewer.start();
54-
});
55-
56-
</script>
57-
58-
</body>
59-
</html>
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<html>
20+
<head>
21+
<script type="text/javascript" language="javascript" src="/resource/js/jquery.js"></script>
22+
<script type="text/javascript" language="javascript" src="/resource/js/ajaxviewer.js"></script>
23+
<script type="text/javascript" language="javascript" src="/resource/js/handler.js"></script>
24+
<link rel="stylesheet" type="text/css" href="/resource/css/ajaxviewer.css"></link>
25+
<title>${title}</title>
26+
</head>
27+
<body>
28+
<div id="toolbar">
29+
<ul>
30+
<li>
31+
<a href="#" onclick="javascript:sendCtrlAltDel();">
32+
<span><img align="left" src="/resource/images/cad.gif" alt="Ctrl-Alt-Del" />Ctrl-Alt-Del</span>
33+
</a>
34+
</li>
35+
<li>
36+
<a href="#" onclick="javascript:sendCtrlEsc();">
37+
<span><img align="left" src="/resource/images/winlog.png" alt="Ctrl-Esc" style="width:16px;height:16px"/>Ctrl-Esc</span>
38+
</a>
39+
</li>
40+
</ul>
41+
<span id="light" class="dark"></span>
42+
</div>
43+
44+
<div id="main_panel" tabindex="1"></div>
45+
46+
<script language="javascript">
47+
48+
var tileMap = [ ${tileSequence} ];
49+
var ajaxViewer = new AjaxViewer('main_panel', '${imgUrl}', '${updateUrl}', tileMap,
50+
${width}, ${height}, ${tileWidth}, ${tileHeight}, ${rawKeyboard});
51+
52+
$(function() {
53+
ajaxViewer.start();
54+
});
55+
56+
</script>
57+
58+
</body>
59+
</html>

0 commit comments

Comments
 (0)