Skip to content

Commit 48b2cf9

Browse files
gaynor@illinois.edugaynor@illinois.edu
gaynor@illinois.edu
authored and
gaynor@illinois.edu
committed
Changed paths for some file in testing to reflect recent refactoring.
1 parent f1e4dd8 commit 48b2cf9

7 files changed

Lines changed: 100 additions & 48 deletions

File tree

‎.idea/compiler.xml‎

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

‎.idea/workspace.xml‎

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

‎core/src/test/java/edu/uiuc/ncsa/security/core/configuration/ConfigInheritanceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* on 2/3/21 at 11:33 AM
1414
*/
1515
public class ConfigInheritanceTest extends AbstractInheritanceTest {
16-
protected String path = "/home/ncsa/dev/ncsa-git/security-lib/ncsa-security-common/ncsa-security-core/src/test/resources/cfg_inheritance/";
16+
protected String path = "/home/ncsa/dev/ncsa-git/security-lib/core/src/test/resources/cfg_inheritance/";
1717
void verbose(String x){
1818
if( MultipleInheritanceEngine.DEBUG_ON){
1919
System.out.println(x);

‎core/src/test/java/edu/uiuc/ncsa/security/core/configuration/MultipleInheritanceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* on 1/19/12 at 10:49 AM
2020
*/
2121
public class MultipleInheritanceTest extends AbstractInheritanceTest {
22-
protected String path = "/home/ncsa/dev/ncsa-git/security-lib/ncsa-security-common/ncsa-security-core/src/test/resources/cfg_loader/";
22+
protected String path = "/home/ncsa/dev/ncsa-git/security-lib/core/src/test/resources/cfg_loader/";
2323

2424

2525
void verbose(String x){

‎sas-server/src/main/java/edu/uiuc/ncsa/sas/webclient/WebClientConfig.form‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<children>
9393
<component id="b382f" class="javax.swing.JLabel">
9494
<constraints>
95-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
95+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
9696
<gridbag weightx="0.0" weighty="0.0"/>
9797
</constraints>
9898
<properties>
@@ -101,7 +101,7 @@
101101
</component>
102102
<component id="9d49f" class="javax.swing.JLabel">
103103
<constraints>
104-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
104+
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
105105
<gridbag weightx="0.0" weighty="0.0"/>
106106
</constraints>
107107
<properties>
@@ -110,7 +110,7 @@
110110
</component>
111111
<component id="46cad" class="javax.swing.JTextField" binding="trFile">
112112
<constraints>
113-
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="9" fill="1" indent="0" use-parent-layout="false">
113+
<grid row="2" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="9" fill="1" indent="0" use-parent-layout="false">
114114
<preferred-size width="150" height="-1"/>
115115
</grid>
116116
<gridbag weightx="10.0" weighty="0.0"/>
@@ -119,7 +119,7 @@
119119
</component>
120120
<component id="a4014" class="javax.swing.JTextField" binding="trPassword">
121121
<constraints>
122-
<grid row="2" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
122+
<grid row="4" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
123123
<preferred-size width="150" height="-1"/>
124124
</grid>
125125
<gridbag weightx="0.0" weighty="0.0"/>
@@ -128,7 +128,7 @@
128128
</component>
129129
<component id="f8dd" class="javax.swing.JLabel">
130130
<constraints>
131-
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
131+
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
132132
<gridbag weightx="0.0" weighty="0.0"/>
133133
</constraints>
134134
<properties>
@@ -137,7 +137,7 @@
137137
</component>
138138
<component id="3d644" class="javax.swing.JTextField" binding="trDN">
139139
<constraints>
140-
<grid row="4" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
140+
<grid row="6" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
141141
<preferred-size width="150" height="-1"/>
142142
</grid>
143143
<gridbag weightx="0.0" weighty="0.0"/>
@@ -146,25 +146,25 @@
146146
</component>
147147
<hspacer id="96216">
148148
<constraints>
149-
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
149+
<grid row="3" column="1" row-span="1" col-span="2" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
150150
<gridbag weightx="0.0" weighty="0.0"/>
151151
</constraints>
152152
</hspacer>
153153
<vspacer id="c7ba4">
154154
<constraints>
155-
<grid row="3" column="1" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
155+
<grid row="5" column="1" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
156156
<gridbag weightx="0.0" weighty="0.0"/>
157157
</constraints>
158158
</vspacer>
159159
<hspacer id="be0dc">
160160
<constraints>
161-
<grid row="5" column="1" row-span="1" col-span="2" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
161+
<grid row="7" column="1" row-span="1" col-span="2" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
162162
<gridbag weightx="0.0" weighty="0.0"/>
163163
</constraints>
164164
</hspacer>
165165
<component id="e822d" class="javax.swing.JLabel">
166166
<constraints>
167-
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
167+
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
168168
<gridbag weightx="0.0" weighty="0.0"/>
169169
</constraints>
170170
<properties>
@@ -173,7 +173,7 @@
173173
</component>
174174
<component id="4571" class="javax.swing.JRadioButton" binding="JKSRadioButton" default-binding="true">
175175
<constraints>
176-
<grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
176+
<grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
177177
<gridbag weightx="0.0" weighty="0.0"/>
178178
</constraints>
179179
<properties>
@@ -182,13 +182,28 @@
182182
</component>
183183
<component id="d7cc9" class="javax.swing.JRadioButton" binding="PKCS12RadioButton" default-binding="true">
184184
<constraints>
185-
<grid row="6" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
185+
<grid row="8" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
186186
<gridbag weightx="0.0" weighty="0.0"/>
187187
</constraints>
188188
<properties>
189189
<text value="PKCS 12"/>
190190
</properties>
191191
</component>
192+
<component id="2202" class="javax.swing.JLabel">
193+
<constraints>
194+
<grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
195+
<gridbag weightx="0.0" weighty="0.0"/>
196+
</constraints>
197+
<properties>
198+
<text value="You only need this page if you are talking to a service with a self-signed certificate."/>
199+
</properties>
200+
</component>
201+
<hspacer id="3a3cb">
202+
<constraints>
203+
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
204+
<gridbag weightx="0.0" weighty="0.0"/>
205+
</constraints>
206+
</hspacer>
192207
</children>
193208
</grid>
194209
</children>

0 commit comments

Comments
 (0)