Skip to content

Commit ae60cfe

Browse files
skavanaghskavanagh
committed
v2.15.10
Updated project dependences. Made cosmetic changes/fixes.
1 parent 1940849 commit ae60cfe

8 files changed

Lines changed: 27 additions & 23 deletions

File tree

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.keybox</groupId>
66
<artifactId>keybox</artifactId>
7-
<version>2.15.00</version>
7+
<version>2.15.10</version>
88
<packaging>war</packaging>
99
<name>KeyBox</name>
1010
<properties>
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>com.h2database</groupId>
2626
<artifactId>h2</artifactId>
27-
<version>1.4.179</version>
27+
<version>1.4.180</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>com.jcraft</groupId>
@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>org.eclipse.jetty</groupId>
9292
<artifactId>jetty-maven-plugin</artifactId>
93-
<version>9.2.1.v20140609</version>
93+
<version>9.2.2.v20140723</version>
9494
<configuration>
9595
<jettyXml>${basedir}/src/test/resources/jetty.xml,${basedir}/src/test/resources/jetty-ssl.xml,${basedir}/src/test/resources/jetty-https.xml</jettyXml>
9696
<scanIntervalSeconds>-1</scanIntervalSeconds>

‎src/main/webapp/admin/view_systems.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<div class="actionMessage">
168168
<p class="error">Systems not available.
169169
<s:if test="%{#session.userType==\"M\"}">
170-
Define systems <a href="../manage/viewSystems.action">here</a>
170+
Define systems (<a href="../manage/viewSystems.action">Manage Systems</a>).
171171
</s:if>
172172
</p>
173173
</div>

‎src/main/webapp/manage/view_profile_systems.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<div id="assign_sys" class="btn btn-default assign_sys_btn">Assign</div>
141141
</s:if>
142142
<s:else>
143-
<div class="error">There are no systems defined. New systems may be defined <a href="viewSystems.action">here</a>.</div>
143+
<div class="error">There are no systems defined (<a href="viewSystems.action">Manage Systems</a>).</div>
144144
</s:else>
145145

146146

‎src/main/webapp/manage/view_profiles.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<div id="add_btn" class="btn btn-default">Add Profile</div>
170170
<div id="add_dialog" title="Add Profile">
171171
<s:form action="saveProfile" class="save_profile_form_add">
172-
<s:textfield name="profile.nm" label="Profile Name" size="15"/>
172+
<s:textfield name="profile.nm" label="Name" size="15"/>
173173
<s:textarea name="profile.desc" label="Profile Description" rows="5" cols="25"/>
174174
<s:hidden name="sortedSet.orderByDirection"/>
175175
<s:hidden name="sortedSet.orderByField"/>
@@ -187,7 +187,7 @@
187187
<s:iterator var="profile" value="sortedSet.itemList" status="stat">
188188
<div id="edit_dialog_<s:property value="id"/>" title="Edit Profile" class="edit_dialog">
189189
<s:form action="saveProfile" id="save_profile_form_edit_%{id}">
190-
<s:textfield name="profile.nm" value="%{nm}" label="Profile Name" size="15"/>
190+
<s:textfield name="profile.nm" value="%{nm}" label="Name" size="15"/>
191191
<s:textarea name="profile.desc" value="%{desc}" label="Profile Description" rows="5"
192192
cols="25"/>
193193
<s:hidden name="profile.id" value="%{id}"/>

‎src/main/webapp/manage/view_user_profiles.jsp‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
4545
//submit add or edit form
4646
$(".submit_btn").button().click(function() {
47-
$(this).prev().submit();
47+
$(this).parents('form:first').submit();
4848
});
4949
//close all forms
5050
$(".cancel_btn").button().click(function() {
@@ -69,8 +69,8 @@
6969
<h3>Grant System Access</h3>
7070
<p>Add / Delete profiles to be assigned to the current user.</p>
7171

72-
<h4><s:property value="user.lastNm"/>,&nbsp;<s:property value="user.firstNm"/>
73-
&nbsp;( <s:property value="user.email"/> )
72+
<h4><s:property value="user.username"/>&nbsp;:&nbsp;<s:property value="user.lastNm"/>,&nbsp;<s:property value="user.firstNm"/>
73+
&nbsp;(<s:property value="user.email"/>)
7474

7575
</h4>
7676

@@ -82,7 +82,7 @@
8282
<thead>
8383

8484
<tr>
85-
<th>Profile Name</th>
85+
<th>Name</th>
8686
<th>&nbsp;</th>
8787
</tr>
8888
</thead>
@@ -126,13 +126,17 @@
126126
<s:select name="profileId" list="profileList" headerKey="" headerValue="- Select One -"
127127
listKey="id" listValue="%{nm}"/>
128128
<s:hidden name="user.id"/>
129+
<tr>
130+
<td>&nbsp;</td>
131+
<td align="left">
132+
<div class="btn btn-default submit_btn">Submit</div>
133+
<div class="btn btn-default cancel_btn">Cancel</div>
134+
</td>
135+
</tr>
129136
</s:form>
130-
<div class="btn btn-default submit_btn">Submit</div>
131-
<div class="btn btn-default cancel_btn">Cancel</div>
132-
</div>
133137
</s:if>
134138
<s:else>
135-
<div class="error">There are no profiles defined. New profiles may be defined <a href="viewProfiles.action">here</a>.</div>
139+
<div class="error">There are no profiles defined (<a href="viewProfiles.action">View Profiles</a>).</div>
136140
</s:else>
137141

138142

‎src/main/webapp/manage/view_users.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<p>Add / Delete users or select a user below to assign profile</p>
135135

136136
<s:if test="sortedSet.itemList!= null && !sortedSet.itemList.isEmpty()">
137-
<table class="table-striped scrollableTable" style="min-width: 80%">
137+
<table class="table-striped scrollableTable" style="min-width: 85%">
138138

139139
<thead>
140140
<tr>
@@ -181,7 +181,7 @@
181181
<td><s:property value="firstNm"/></td>
182182
<td><s:property value="email"/></td>
183183
<td>
184-
<div style="width:220px">
184+
<div style="width:235px">
185185

186186
<div id="edit_btn_<s:property value="id"/>" class="btn btn-default edit_btn" style="float:left">
187187
Edit
@@ -191,7 +191,7 @@
191191
<s:if test="userType==\"A\"">
192192
<a href="viewUserProfiles.action?user.id=<s:property value="id"/>">
193193
<div id="profile_btn_<s:property value="id"/>" class="btn btn-default edit_btn" style="float:left">
194-
User Profiles
194+
Assign Profiles
195195
</div></a>
196196
</s:if>
197197
<div style="clear:both"></div>

‎src/test/resources/jetty-ssl.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) -->
88
<!-- ============================================================= -->
99
<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
10-
<Set name="KeyStorePath">src/test/resources/keystore</Set>
11-
<Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="sshb0x1234"/></Set>
12-
<Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="sshb0x1234"/></Set>
13-
<Set name="TrustStorePath">src/test/resources/keystore</Set>
14-
<Set name="TrustStorePassword"><Property name="jetty.truststore.password" default="sshb0x1234"/></Set>
10+
<Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.keystore" default="src/test/resources/keystore"/></Set>
11+
<Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="OBF:1ini1l4t1mfb1x8616dq20zj16cw1x8o1mbb1l8h1ikw"/></Set>
12+
<Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="OBF:1ini1l4t1mfb1x8616dq20zj16cw1x8o1mbb1l8h1ikw"/></Set>
1513
<Set name="EndpointIdentificationAlgorithm"></Set>
14+
<Set name="NeedClientAuth"><Property name="jetty.ssl.needClientAuth" default="false"/></Set>
15+
<Set name="WantClientAuth"><Property name="jetty.ssl.wantClientAuth" default="false"/></Set>
1616
<Set name="ExcludeCipherSuites">
1717
<Array type="String">
1818
<Item>SSL_RSA_WITH_DES_CBC_SHA</Item>

‎src/test/resources/keystore‎

-12 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)