Skip to content
This repository was archived by the owner on Dec 21, 2021. It is now read-only.

Commit 40545be

Browse files
jjg-123jjg-123
committed
Cleaned up node naming.
1 parent e9f992b commit 40545be

File tree

9 files changed

+89
-72
lines changed

9 files changed

+89
-72
lines changed

‎.idea/artifacts/scitokens_client_war_exploded.xml‎

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

‎.idea/artifacts/scitokens_server_war_exploded.xml‎

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

‎scitokens-client/src/main/java/org/scitokens/client/STClientBootstrapper.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.scitokens.client;
2+
3+
import edu.uiuc.ncsa.oa4mp.oauth2.client.OA2ClientBootstrapper;
4+
5+
/**
6+
* <p>Created by Jeff Gaynor<br>
7+
* on 9/17/19 at 3:06 PM
8+
*/
9+
public class STClientBootstrapper extends OA2ClientBootstrapper {
10+
public static final String ST_CLIENT_CONFIG_FILE_KEY= "scitokens:client.config.file";
11+
public static final String ST_CLIENT_CONFIG_NAME_KEY= "scitokens:client.config.name";
12+
@Override
13+
public String getOa4mpConfigFileKey() {
14+
return ST_CLIENT_CONFIG_FILE_KEY;
15+
}
16+
17+
@Override
18+
public String getOa4mpConfigNameKey() {
19+
return ST_CLIENT_CONFIG_NAME_KEY;
20+
}
21+
}

‎scitokens-client/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,38 @@
3131
<servlet-name>ready</servlet-name>
3232
<url-pattern>/ready</url-pattern>
3333
</servlet-mapping>
34-
<!--
35-
<servlet>
36-
<servlet-name>startRequest</servlet-name>
37-
<servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2StartRequest</servlet-class>
38-
<load-on-startup>1</load-on-startup>
39-
</servlet>
40-
41-
<servlet-mapping>
42-
<servlet-name>startRequest</servlet-name>
43-
<url-pattern>/startRequest</url-pattern>
44-
</servlet-mapping>
45-
46-
47-
<servlet>
48-
<servlet-name>ready</servlet-name>
49-
<servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2ReadyServlet</servlet-class>
50-
<load-on-startup>1</load-on-startup>
51-
</servlet>
52-
53-
<servlet-mapping>
54-
<servlet-name>ready</servlet-name>
55-
<url-pattern>/ready</url-pattern>
56-
</servlet-mapping>
57-
-->
34+
<!--
35+
<servlet>
36+
<servlet-name>startRequest</servlet-name>
37+
<servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2StartRequest</servlet-class>
38+
<load-on-startup>1</load-on-startup>
39+
</servlet>
40+
41+
<servlet-mapping>
42+
<servlet-name>startRequest</servlet-name>
43+
<url-pattern>/startRequest</url-pattern>
44+
</servlet-mapping>
45+
46+
47+
<servlet>
48+
<servlet-name>ready</servlet-name>
49+
<servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2ReadyServlet</servlet-class>
50+
<load-on-startup>1</load-on-startup>
51+
</servlet>
52+
53+
<servlet-mapping>
54+
<servlet-name>ready</servlet-name>
55+
<url-pattern>/ready</url-pattern>
56+
</servlet-mapping>
57+
-->
5858
<welcome-file-list>
5959
<welcome-file>
6060
index.html <!--default file to be displayed at http://foo.org/client-->
6161
</welcome-file>
6262

6363
</welcome-file-list>
64-
<!-- <listener>
65-
<listener-class>edu.uiuc.ncsa.myproxy.oa4mp.client.loader.ClientBootstrapper</listener-class>
66-
</listener>-->
6764
<listener>
68-
<listener-class>edu.uiuc.ncsa.oa4mp.oauth2.client.OA2ClientBootstrapper</listener-class>
65+
<listener-class>org.scitokens.client.STClientBootstrapper</listener-class>
6966
</listener>
7067

7168
<!--
@@ -96,20 +93,20 @@
9693

9794
<!--
9895
New and improved way to specify the XML-based configuration file
96+
9997
-->
10098
<!--
10199
<context-param>
102-
<param-name>oa4mp:oauth2.client.config.file</param-name>
100+
<param-name>scitokens:client.config.file</param-name>
103101
<param-value>/path/to/config-file.xml</param-value>
104102
</context-param>
105-
-->
106-
103+
-->
107104

108105
<!-- (Optional) name of the configuration within the file to load -->
109-
<context-param>
110-
<param-name>oa4mp:oauth2.client.config.name</param-name>
111-
<param-value>scitokens-client</param-value>
112-
</context-param>
113106

107+
<context-param>
108+
<param-name>scitokens:client.config.name</param-name>
109+
<param-value>scitokens-client</param-value>
110+
</context-param>
114111
</web-app>
115112

‎scitokens-common/buildNumber.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#maven.buildNumber.plugin properties file
2-
#Fri Jul 12 11:29:22 CDT 2019
3-
buildNumber\\d*=517
2+
#Fri Aug 16 15:59:15 CDT 2019
3+
buildNumber\\d*=525

‎scitokens-common/src/main/java/org/scitokens/util/SciTokensClaims.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* on 1/22/18 at 4:06 PM
88
*/
99
public interface SciTokensClaims extends OA2Claims {
10-
public static final String JWT_ID = "jti";
1110
public static String ST_SCOPE = "scope";
1211
public static String ST_CLIENT_IDENTIFIER = "cid";
1312
public static String CLAIM_OPERATION_WRITE = "write";

‎scitokens-server/buildNumber.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#maven.buildNumber.plugin properties file
2-
#Fri Jul 12 11:29:36 CDT 2019
3-
buildNumber\\d*=367
2+
#Fri Aug 16 15:59:14 CDT 2019
3+
buildNumber\\d*=373

‎scitokens-server/src/main/java/org/scitokens/loader/STBootstrapper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* on 9/25/17 at 1:06 PM
1313
*/
1414
public class STBootstrapper extends OA2Bootstrapper {
15-
/* public static final String ST_CONFIG_FILE_KEY = "oa4mp:scitokens.server.config.file";
16-
public static final String ST_CONFIG_NAME_KEY = "oa4mp:scitokens.server.config.name";
15+
public static final String ST_CONFIG_FILE_KEY = "scitokens:server.config.file";
16+
public static final String ST_CONFIG_NAME_KEY = "scitokens:server.config.name";
1717

1818
@Override
1919
public String getOa4mpConfigFileKey() {
@@ -24,7 +24,7 @@ public String getOa4mpConfigFileKey() {
2424
public String getOa4mpConfigNameKey() {
2525
return ST_CONFIG_NAME_KEY;
2626
}
27-
*/
27+
2828
@Override
2929
public ConfigurationLoader getConfigurationLoader(ConfigurationNode node) throws MyConfigurationException {
3030
return new STLoader(node);

‎scitokens-server/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
version="2.5">
77

88
<display-name>The SciTokens OAuth Service</display-name>
9-
\
9+
1010

1111
<servlet>
1212
<servlet-name>accessToken</servlet-name>
@@ -168,14 +168,14 @@
168168

169169
<!--
170170
<context-param>
171-
<param-name>oa4mp:scitokens.server.config.file</param-name>
171+
<param-name>scitokens:server.config.file</param-name>
172172
<param-value>/home/ncsa/dev/csd/config/servers.xml</param-value>
173173
</context-param>
174174
-->
175175

176176

177177
<context-param>
178-
<param-name>oa4mp:oauth2.server.config.name</param-name>
178+
<param-name>scitokens:server.config.name</param-name>
179179
<param-value>scitokens-server</param-value>
180180
</context-param>
181181

0 commit comments

Comments
 (0)