https://github.com/ncsa/oa4mp/issues/205

ncsa · Sep 12, 2024 · f5c9e3e · f5c9e3e
1 parent 80906ef
commit f5c9e3e
Show file tree

Hide file tree

Showing 555 changed files with 2,236 additions and 4,216 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ There are a few environment variables you should define before doing anything. T
 ## Updating the release version
 
 Do a global replace of the SNAPSHOT tag with the version you are creating. 
-E.g. replace `5.3-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in 
+E.g. replace `5.6-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in 
 the documentation. If you are updating teh website, you do not need to update 
 anything in `$NCSA_DEV_INPUT/oa4mp/docs` which will be replaced shortly. 
 
@@ -126,7 +126,7 @@ resolution maven uses tends to have multiple jars created then deploy complains.
 # Building and deploying the website
 
 You can also update the website. You must be able to commit to Github to do this. The basic way this works is that you 
-1. Do a global replace of the SNAPSHOT tag with the version you are creating. E.g. replace `5.3-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in the documentation. You do not need to update anything in `$NCSA_DEV_INPUT/oa4mp/docs` which will be replaced shortly. 
+1. Do a global replace of the SNAPSHOT tag with the version you are creating. E.g. replace `5.6-SNAPSHOT` with `5.3.5`. Note this must be global in all files since this is used extensively in the documentation. You do not need to update anything in `$NCSA_DEV_INPUT/oa4mp/docs` which will be replaced shortly. 
 2. run the `build.sh` script to create all of the basic documentation 
 3. run `$NCSA_DEV_INPUT/oa4mp-website/make-website.sh` which creates the entire website and stick it in `$NCSA_DEV_INPUT/oa4mp/docs`
 4. commit everything to Git

diff --git a/client-api/pom.xml b/client-api/pom.xml
@@ -6,9 +6,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>edu.uiuc.ncsa.myproxy</groupId>
-        <artifactId>oa4mp</artifactId>
-        <version>5.3-SNAPSHOT</version>
+        <groupId>org.oa4mp</groupId>
+        <artifactId>oa4mp-parent</artifactId>
+        <version>5.6-SNAPSHOT</version>
     </parent>
     <artifactId>client-api</artifactId>
     <name>OA4MP client API.</name>
@@ -20,26 +20,26 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>client</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>common</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>oauth2</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/client-api/src/main/java/org/oa4mp/client/api/AbstractOA4MPService.java b/client-api/src/main/java/org/oa4mp/client/api/AbstractOA4MPService.java
@@ -3,10 +3,10 @@
 import org.oa4mp.client.api.storage.AssetProvider;
 import org.oa4mp.client.api.storage.AssetStore;
 import org.oa4mp.client.api.storage.MemoryAssetStore;
-import org.oa4mp.delegation.request.DelegatedAssetRequest;
-import org.oa4mp.delegation.request.DelegatedAssetResponse;
-import org.oa4mp.delegation.request.DelegationRequest;
-import org.oa4mp.delegation.request.DelegationResponse;
+import org.oa4mp.delegation.client.request.DelegatedAssetRequest;
+import org.oa4mp.delegation.client.request.DelegatedAssetResponse;
+import org.oa4mp.delegation.client.request.DelegationRequest;
+import org.oa4mp.delegation.client.request.DelegationResponse;
 import org.oa4mp.delegation.common.token.AuthorizationGrant;
 import org.oa4mp.delegation.common.token.MyX509Certificates;
 import org.oa4mp.delegation.common.token.Verifier;

diff --git a/client-api/src/main/java/org/oa4mp/client/api/ClientEnvironment.java b/client-api/src/main/java/org/oa4mp/client/api/ClientEnvironment.java
@@ -2,8 +2,8 @@
 
 import org.oa4mp.client.api.storage.AssetProvider;
 import org.oa4mp.client.api.storage.AssetStore;
-import org.oa4mp.delegation.AbstractClientEnvironment;
-import org.oa4mp.delegation.DelegationService;
+import org.oa4mp.delegation.client.AbstractClientEnvironment;
+import org.oa4mp.delegation.client.DelegationService;
 import org.oa4mp.delegation.common.storage.clients.Client;
 import org.oa4mp.delegation.common.token.TokenForge;
 import edu.uiuc.ncsa.security.core.exceptions.GeneralException;

diff --git a/client-api/src/main/java/org/oa4mp/client/api/loader/AbstractClientLoader.java b/client-api/src/main/java/org/oa4mp/client/api/loader/AbstractClientLoader.java
@@ -3,7 +3,7 @@
 import org.oa4mp.client.api.ClientEnvironment;
 import org.oa4mp.client.api.ClientLoaderInterface;
 import org.oa4mp.client.api.ClientXMLTags;
-import org.oa4mp.delegation.DelegationService;
+import org.oa4mp.delegation.client.DelegationService;
 import org.oa4mp.delegation.common.servlet.DBConfigLoader;
 import org.oa4mp.delegation.server.OIDCDiscoveryTags;
 import edu.uiuc.ncsa.security.core.configuration.Configurations;

diff --git a/client-installer/buildNumber.properties b/client-installer/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Wed Sep 11 17:26:27 CDT 2024
-buildNumber\\d*=203
+#Thu Sep 12 09:16:49 CDT 2024
+buildNumber\\d*=213
diff --git a/client-installer/pom.xml b/client-installer/pom.xml
@@ -4,12 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>edu.uiuc.ncsa.myproxy</groupId>
-        <artifactId>oa4mp</artifactId>
-        <version>5.3-SNAPSHOT</version>
+        <groupId>org.oa4mp</groupId>
+        <artifactId>oa4mp-parent</artifactId>
+        <version>5.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-installer</artifactId>
+    <name>OA4MP client installer</name>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
@@ -18,14 +19,14 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>installer</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>installer</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/client-loader/pom.xml b/client-loader/pom.xml
@@ -5,13 +5,13 @@
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>edu.uiuc.ncsa.myproxy</groupId>
-        <artifactId>oa4mp</artifactId>
-        <version>5.3-SNAPSHOT</version>
+        <groupId>org.oa4mp</groupId>
+        <artifactId>oa4mp-parent</artifactId>
+        <version>5.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-loader</artifactId>
-    <name>OAuth 2/Open ID Connect support for the client</name>
+    <name>OA4MP client loader</name>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -20,37 +20,29 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>client-api</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
-
-<!--        <dependency>
-            <groupId>edu.uiuc.ncsa.security</groupId>
-            <artifactId>util</artifactId>
-            <version>5.3-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>-->
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>10.14.2.0</version>
         </dependency>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>myproxy-logon</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>oauth2</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/client-loader/src/main/java/org/oa4mp/client/loader/OA2ClientEnvironment.java b/client-loader/src/main/java/org/oa4mp/client/loader/OA2ClientEnvironment.java
@@ -3,7 +3,7 @@
 import org.oa4mp.client.api.ClientEnvironment;
 import org.oa4mp.client.api.storage.AssetProvider;
 import org.oa4mp.client.api.storage.AssetStore;
-import org.oa4mp.delegation.DelegationService;
+import org.oa4mp.delegation.client.DelegationService;
 import org.oa4mp.delegation.common.storage.clients.Client;
 import org.oa4mp.delegation.common.token.TokenForge;
 import edu.uiuc.ncsa.security.core.util.BasicIdentifier;

diff --git a/client-loader/src/main/java/org/oa4mp/client/loader/OA2ClientLoader.java b/client-loader/src/main/java/org/oa4mp/client/loader/OA2ClientLoader.java
@@ -21,7 +21,7 @@
 import org.oa4mp.client.api.OA4MPServiceProvider;
 import org.oa4mp.client.api.loader.AbstractClientLoader;
 import org.oa4mp.client.api.storage.*;
-import org.oa4mp.delegation.DelegationService;
+import org.oa4mp.delegation.client.DelegationService;
 import org.oa4mp.delegation.common.OA4MPVersion;
 import org.oa4mp.delegation.common.storage.clients.Client;
 import org.oa4mp.delegation.common.token.TokenForge;

diff --git a/client-loader/src/main/java/org/oa4mp/client/loader/OA2ClientLoaderImpl.java b/client-loader/src/main/java/org/oa4mp/client/loader/OA2ClientLoaderImpl.java
@@ -2,7 +2,7 @@
 
 import org.oa4mp.client.api.ClientLoaderInterface;
 import org.oa4mp.client.api.storage.AssetProvider;
-import org.oa4mp.delegation.DelegationService;
+import org.oa4mp.delegation.client.DelegationService;
 import org.oa4mp.delegation.common.token.TokenForge;
 import org.oa4mp.delegation.server.OA2TokenForge;
 import edu.uiuc.ncsa.security.core.exceptions.MyConfigurationException;

diff --git a/client-loader/src/main/java/org/oa4mp/client/loader/OA2MPService.java b/client-loader/src/main/java/org/oa4mp/client/loader/OA2MPService.java
@@ -1,13 +1,25 @@
 package org.oa4mp.client.loader;
 
+import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
+import edu.uiuc.ncsa.security.core.exceptions.NFWException;
+import edu.uiuc.ncsa.security.core.util.DebugUtil;
+import edu.uiuc.ncsa.security.servlet.ServiceClient;
+import edu.uiuc.ncsa.security.util.crypto.CertUtil;
+import edu.uiuc.ncsa.security.util.crypto.KeyUtil;
+import edu.uiuc.ncsa.security.util.crypto.MyPKCS10CertRequest;
+import edu.uiuc.ncsa.security.util.crypto.PEMFormatUtil;
+import edu.uiuc.ncsa.security.util.jwk.JSONWebKeys;
+import net.sf.json.JSONObject;
 import org.oa4mp.client.api.Asset;
 import org.oa4mp.client.api.AssetResponse;
 import org.oa4mp.client.api.ClientEnvironment;
 import org.oa4mp.client.api.OA4MPService;
+import org.oa4mp.delegation.client.request.*;
 import org.oa4mp.delegation.common.storage.clients.Client;
 import org.oa4mp.delegation.common.token.AuthorizationGrant;
 import org.oa4mp.delegation.common.token.MyX509Certificates;
 import org.oa4mp.delegation.common.token.Verifier;
+import org.oa4mp.delegation.common.token.impl.*;
 import org.oa4mp.delegation.server.NonceHerder;
 import org.oa4mp.delegation.server.OA2Constants;
 import org.oa4mp.delegation.server.UserInfo;
@@ -18,18 +30,6 @@
 import org.oa4mp.delegation.server.jwt.MyOtherJWTUtil2;
 import org.oa4mp.delegation.server.server.InvalidNonceException;
 import org.oa4mp.delegation.server.server.claims.OA2Claims;
-import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
-import edu.uiuc.ncsa.security.core.exceptions.NFWException;
-import edu.uiuc.ncsa.security.core.util.DebugUtil;
-import edu.uiuc.ncsa.security.servlet.ServiceClient;
-import edu.uiuc.ncsa.security.util.crypto.CertUtil;
-import edu.uiuc.ncsa.security.util.crypto.KeyUtil;
-import edu.uiuc.ncsa.security.util.crypto.MyPKCS10CertRequest;
-import edu.uiuc.ncsa.security.util.crypto.PEMFormatUtil;
-import edu.uiuc.ncsa.security.util.jwk.JSONWebKeys;
-import net.sf.json.JSONObject;
-import org.oa4mp.delegation.common.token.impl.*;
-import org.oa4mp.delegation.request.*;
 
 import java.net.URI;
 import java.security.KeyPair;

diff --git a/client-oauth2/pom.xml b/client-oauth2/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<!-- UNUSED -->
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>edu.uiuc.ncsa.myproxy</groupId>
-        <artifactId>oa4mp</artifactId>
-        <version>5.3-SNAPSHOT</version>
+        <groupId>org.oa4mp</groupId>
+        <artifactId>oa4mp-parent</artifactId>
+        <version>5.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>client-oauth2</artifactId>
@@ -20,14 +20,14 @@
     </properties>
     <dependencies>
        <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>client-loader</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>client-api</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -43,12 +43,12 @@
         <dependency>
             <groupId>edu.uiuc.ncsa.security</groupId>
             <artifactId>servlet</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
+            <groupId>org.oa4mp</groupId>
             <artifactId>oauth2</artifactId>
-            <version>5.3-SNAPSHOT</version>
+            <version>5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>