Cleaned up node naming.

scitokens · Sep 17, 2019 · 40545be · 40545be
1 parent e9f992b
commit 40545be
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 72 deletions.
diff --git a/.idea/artifacts/scitokens_client_war_exploded.xml b/.idea/artifacts/scitokens_client_war_exploded.xml
diff --git a/.idea/artifacts/scitokens_server_war_exploded.xml b/.idea/artifacts/scitokens_server_war_exploded.xml
diff --git a/scitokens-client/src/main/java/org/scitokens/client/STClientBootstrapper.java b/scitokens-client/src/main/java/org/scitokens/client/STClientBootstrapper.java
@@ -0,0 +1,21 @@
+package org.scitokens.client;
+
+import edu.uiuc.ncsa.oa4mp.oauth2.client.OA2ClientBootstrapper;
+
+/**
+ * <p>Created by Jeff Gaynor<br>
+ * on 9/17/19 at  3:06 PM
+ */
+public class STClientBootstrapper extends OA2ClientBootstrapper {
+    public static final String ST_CLIENT_CONFIG_FILE_KEY= "scitokens:client.config.file";
+    public static final String ST_CLIENT_CONFIG_NAME_KEY= "scitokens:client.config.name";
+    @Override
+    public String getOa4mpConfigFileKey() {
+        return ST_CLIENT_CONFIG_FILE_KEY;
+    }
+
+    @Override
+    public String getOa4mpConfigNameKey() {
+        return ST_CLIENT_CONFIG_NAME_KEY;
+    }
+}
diff --git a/scitokens-client/src/main/webapp/WEB-INF/web.xml b/scitokens-client/src/main/webapp/WEB-INF/web.xml
@@ -31,41 +31,38 @@
         <servlet-name>ready</servlet-name>
         <url-pattern>/ready</url-pattern>
     </servlet-mapping>
-<!--
-    <servlet>
-           <servlet-name>startRequest</servlet-name>
-           <servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2StartRequest</servlet-class>
-           <load-on-startup>1</load-on-startup>
-       </servlet>
-
-       <servlet-mapping>
-           <servlet-name>startRequest</servlet-name>
-           <url-pattern>/startRequest</url-pattern>
-       </servlet-mapping>
-
-
-       <servlet>
-           <servlet-name>ready</servlet-name>
-           <servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2ReadyServlet</servlet-class>
-           <load-on-startup>1</load-on-startup>
-       </servlet>
-
-       <servlet-mapping>
-           <servlet-name>ready</servlet-name>
-           <url-pattern>/ready</url-pattern>
-       </servlet-mapping>
-    -->
+    <!--
+        <servlet>
+               <servlet-name>startRequest</servlet-name>
+               <servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2StartRequest</servlet-class>
+               <load-on-startup>1</load-on-startup>
+           </servlet>
+
+           <servlet-mapping>
+               <servlet-name>startRequest</servlet-name>
+               <url-pattern>/startRequest</url-pattern>
+           </servlet-mapping>
+
+
+           <servlet>
+               <servlet-name>ready</servlet-name>
+               <servlet-class>edu.uiuc.ncsa.oa4mp.oauth2.client.servlet.OA2ReadyServlet</servlet-class>
+               <load-on-startup>1</load-on-startup>
+           </servlet>
+
+           <servlet-mapping>
+               <servlet-name>ready</servlet-name>
+               <url-pattern>/ready</url-pattern>
+           </servlet-mapping>
+        -->
     <welcome-file-list>
         <welcome-file>
             index.html <!--default file to be displayed at http://foo.org/client-->
         </welcome-file>
 
     </welcome-file-list>
-<!--    <listener>
-        <listener-class>edu.uiuc.ncsa.myproxy.oa4mp.client.loader.ClientBootstrapper</listener-class>
-    </listener>-->
     <listener>
-        <listener-class>edu.uiuc.ncsa.oa4mp.oauth2.client.OA2ClientBootstrapper</listener-class>
+        <listener-class>org.scitokens.client.STClientBootstrapper</listener-class>
     </listener>
 
     <!--
@@ -96,20 +93,20 @@
 
     <!--
        New and improved way to specify the XML-based configuration file
+
     -->
     <!--
     <context-param>
-        <param-name>oa4mp:oauth2.client.config.file</param-name>
+        <param-name>scitokens:client.config.file</param-name>
         <param-value>/path/to/config-file.xml</param-value>
     </context-param>
-    -->
-
+     -->
 
     <!-- (Optional) name of the configuration within the file to load -->
-    <context-param>
-        <param-name>oa4mp:oauth2.client.config.name</param-name>
-        <param-value>scitokens-client</param-value>
-    </context-param>
 
+   <context-param>
+       <param-name>scitokens:client.config.name</param-name>
+       <param-value>scitokens-client</param-value>
+   </context-param>
 </web-app>
 
diff --git a/scitokens-common/buildNumber.properties b/scitokens-common/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Fri Jul 12 11:29:22 CDT 2019
-buildNumber\\d*=517
+#Fri Aug 16 15:59:15 CDT 2019
+buildNumber\\d*=525
diff --git a/scitokens-common/src/main/java/org/scitokens/util/SciTokensClaims.java b/scitokens-common/src/main/java/org/scitokens/util/SciTokensClaims.java
@@ -7,7 +7,6 @@
  * on 1/22/18 at  4:06 PM
  */
 public interface SciTokensClaims extends OA2Claims {
-    public static final String JWT_ID = "jti";
     public static String ST_SCOPE = "scope";
     public static String ST_CLIENT_IDENTIFIER = "cid";
     public static String CLAIM_OPERATION_WRITE = "write";

diff --git a/scitokens-server/buildNumber.properties b/scitokens-server/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Fri Jul 12 11:29:36 CDT 2019
-buildNumber\\d*=367
+#Fri Aug 16 15:59:14 CDT 2019
+buildNumber\\d*=373
diff --git a/scitokens-server/src/main/java/org/scitokens/loader/STBootstrapper.java b/scitokens-server/src/main/java/org/scitokens/loader/STBootstrapper.java
@@ -12,8 +12,8 @@
  * on 9/25/17 at  1:06 PM
  */
 public class STBootstrapper extends OA2Bootstrapper {
-  /*  public static final String ST_CONFIG_FILE_KEY = "oa4mp:scitokens.server.config.file";
-    public static final String ST_CONFIG_NAME_KEY = "oa4mp:scitokens.server.config.name";
+    public static final String ST_CONFIG_FILE_KEY = "scitokens:server.config.file";
+    public static final String ST_CONFIG_NAME_KEY = "scitokens:server.config.name";
 
     @Override
     public String getOa4mpConfigFileKey() {
@@ -24,7 +24,7 @@ public String getOa4mpConfigFileKey() {
     public String getOa4mpConfigNameKey() {
         return ST_CONFIG_NAME_KEY;
     }
-*/
+
     @Override
     public ConfigurationLoader getConfigurationLoader(ConfigurationNode node) throws MyConfigurationException {
         return new STLoader(node);

diff --git a/scitokens-server/src/main/webapp/WEB-INF/web.xml b/scitokens-server/src/main/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@
          version="2.5">
 
     <display-name>The SciTokens OAuth Service</display-name>
-\
+
 
     <servlet>
         <servlet-name>accessToken</servlet-name>
@@ -168,14 +168,14 @@
 
 <!--
     <context-param>
-        <param-name>oa4mp:scitokens.server.config.file</param-name>
+        <param-name>scitokens:server.config.file</param-name>
         <param-value>/home/ncsa/dev/csd/config/servers.xml</param-value>
     </context-param>
 -->
 
 
     <context-param>
-        <param-name>oa4mp:oauth2.server.config.name</param-name>
+        <param-name>scitokens:server.config.name</param-name>
         <param-value>scitokens-server</param-value>
     </context-param>