changed to unmaintained

Issue-ID: CIMAN-33

Signed-off-by: Kenny Paul <kpaul@linuxfoundation.org>
Change-Id: I1ad834908c16091843c4c8fcdd2089e94c306568

diff --git a/INFO.yaml b/INFO.yaml
index 74fedbc..20fd811 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -20,13 +20,13 @@ mailing_list:
     tag: '<[sub-project_name]>'
 realtime_discussion: ''
 meetings:
-    - type: 'zoom'
-      agenda: 'https://wiki.onap.org/display/DW/AAF+Meeting+Minutes'
-      url: 'https://wiki.onap.org/pages/viewpage.action?pageId=15302787'
+    - type: 'n/a'
+      agenda: 'n/a'
+      url: 'n/a'
       server: 'n/a'
       channel: 'n/a'
-      repeats: 'weekly'
-      time: '14:00 UTC'
+      repeats: 'n/a'
+      time: 'n/a'
 repositories:
     - 'aaf/authz'
 committers:

diff --git a/auth-client/pom.xml b/auth-client/pom.xml
index bb6043c..f87f982 100644 (file)
--- a/auth-client/pom.xml
+++ b/auth-client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>aaf-auth-client</artifactId>

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index dfd6ef6..b8cd5ef 100644 (file)
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index a82fbc7..0be9d85 100644 (file)
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index cc82519..94c2a6d 100644 (file)
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 4ffd87b..656d45a 100644 (file)
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index 0c251bf..3d3cede 100644 (file)
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 257db1d..bd3af3a 100644 (file)
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -26,7 +26,7 @@
         <artifactId>authparent</artifactId>
         <relativePath>../pom.xml</relativePath>
         <groupId>org.onap.aaf.authz</groupId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>aaf-auth-deforg</artifactId>

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index d5217ed..21e820c 100644 (file)
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index 1d7460b..cb61fe0 100644 (file)
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index cfc94e1..856a316 100644 (file)
--- a/auth/auth-hello/pom.xml
+++ b/auth/auth-hello/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 0b89dd3..e30fc39 100644 (file)
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index e234ea8..19f6cfc 100644 (file)
--- a/auth/auth-oauth/pom.xml
+++ b/auth/auth-oauth/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 45f89bf..45cd601 100644 (file)
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml
index ab99c70..8f7782e 100644 (file)
--- a/auth/docker/pom.xml
+++ b/auth/docker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/pom.xml b/auth/pom.xml
index fbb050e..16804d3 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
     <artifactId>authparent</artifactId>
     <name>AAF Auth Parent</name>

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 8051ffa..5077ddb 100644 (file)
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
index dbb9d5c..e16782f 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
@@ -34,6 +34,7 @@ import org.onap.aaf.cadi.User;
 import org.onap.aaf.cadi.aaf.AAFPermission;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.locator.SingleEndpointLocator;
 import org.onap.aaf.cadi.lur.ConfigPrincipal;
 
 import aaf.v2_0.CredRequest;
@@ -108,7 +109,7 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
             }
         }
 
-        AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.cleanInterval);
+        AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.userExpires);
         // Since I've relocated the Validation piece in the Principal, just revalidate, then do Switch
         // Statement
         switch(cp.revalidate(state)) {
@@ -116,13 +117,13 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
                 if (usr!=null) {
                     usr.principal = cp;
                 } else {
-                    addUser(new User<AAFPermission>(cp,con.timeout));
+                    addUser(new User<AAFPermission>(cp,con.userExpires));
                 }
                 return null;
             case INACCESSIBLE:
                 return "AAF Inaccessible";
             case UNVALIDATED:
-                addUser(new User<AAFPermission>(user,bytes,con.timeout));
+                addUser(new User<AAFPermission>(user,bytes,con.userExpires));
                 return "user/pass combo invalid for " + user;
             case DENIED:
                 return "AAF denies API for " + user;
@@ -143,10 +144,14 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
 
         public Resp revalidate(Object state) {
             int maxRetries = 15;
-            try { // these SHOULD be AAFConHttp and AAFLocator objects, but put in a try anyway to be safe
+            try { // these SHOULD be an AAFConHttp and a AAFLocator or SingleEndpointLocator objects, but put in a try to be safe
                 AAFConHttp forceCastCon = (AAFConHttp) con;
-                AAFLocator forceCastLoc = (AAFLocator) forceCastCon.hman().loc;
-                maxRetries = forceCastLoc.maxIters();
+                if (forceCastCon.hman().loc instanceof SingleEndpointLocator) {
+                    maxRetries = 1; // we cannot retry the single LGW gateway!
+                } else {
+                    AAFLocator forceCastLoc = (AAFLocator) forceCastCon.hman().loc;
+                    maxRetries = forceCastLoc.maxIters();
+                }
             } catch (Exception e) {
                 access.log(Access.Level.DEBUG, e);
             }
@@ -156,20 +161,15 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
                 try {
                     Miss missed = missed(getName(), getCred());
                     if (missed == null || missed.mayContinue()) {
-                        CredRequest cr = new CredRequest();
-                        cr.setId(getName());
-                        cr.setPassword(new String(getCred()));
-                        Rcli<CLIENT> client = con.clientIgnoreAlreadyAttempted(attemptedUris);
+                        Rcli<CLIENT> client = con.clientIgnoreAlreadyAttempted(attemptedUris).forUser(con.basicAuth(getName(), new String(getCred())));
                         thisUri = client.getURI();
-                        Future<String> fp = client.readPost("/authn/validate", con.credReqDF, cr);
-                        //Rcli<CLIENT> client = con.client().forUser(con.basicAuth(getName(), new String(getCred())));
-                        //Future<String> fp = client.read(
-                        //        "/authn/basicAuth",
-                        //        "text/plain"
-                        //       );
+                        Future<String> fp = client.read(
+                                "/authn/basicAuth",
+                                "text/plain"
+                               );
                         if (fp.get(con.timeout)) {
                             expires = System.currentTimeMillis() + timeToLive;
-                            addUser(new User<AAFPermission>(this, expires));
+                            addUser(new User<AAFPermission>(this, timeToLive));
                             return Resp.REVALIDATED;
                         } else {
                             addMiss(getName(), getCred());

diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index b0a4492..1ecc96a 100644 (file)
--- a/cadi/client/pom.xml
+++ b/cadi/client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index eda4a39..1dc419a 100644 (file)
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -16,7 +16,7 @@
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
         <relativePath>..</relativePath>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index 0c4a701..a9a2207 100644 (file)
--- a/cadi/oauth-enduser/pom.xml
+++ b/cadi/oauth-enduser/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     

diff --git a/cadi/pom.xml b/cadi/pom.xml
index ebfaf50..ba74e92 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
     <artifactId>cadiparent</artifactId>
     <name>AAF CADI Parent (Code, Access, Data, Identity)</name>

diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml
index 0350df4..c2f3982 100644 (file)
--- a/cadi/servlet-sample/pom.xml
+++ b/cadi/servlet-sample/pom.xml
@@ -4,7 +4,7 @@
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
         <relativePath>..</relativePath>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>CADI Servlet Sample (Test Only)</name>

diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index 409ce4b..58ba364 100644 (file)
--- a/misc/env/pom.xml
+++ b/misc/env/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index 463029a..cc08f44 100644 (file)
--- a/misc/log4j/pom.xml
+++ b/misc/log4j/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/pom.xml b/misc/pom.xml
index 66eb64a..1c475ce 100644 (file)
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -25,7 +25,7 @@
     <parent>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>parent</artifactId>
-       <version>2.7.1-SNAPSHOT</version>
+       <version>2.7.4-SNAPSHOT</version>
     </parent>
     <artifactId>miscparent</artifactId>
     <name>AAF Misc Parent</name>

diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index c7cbd7d..b062533 100644 (file)
--- a/misc/rosetta/pom.xml
+++ b/misc/rosetta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index 90f287f..8de9354 100644 (file)
--- a/misc/xgen/pom.xml
+++ b/misc/xgen/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 8ba61fe..9edf385 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>parent</artifactId>
-    <version>2.7.1-SNAPSHOT</version>
+    <version>2.7.4-SNAPSHOT</version>
     <name>aaf-authz</name>
     <packaging>pom</packaging>
 

diff --git a/releases/2.7.1.yaml b/releases/2.7.1.yaml
new file mode 100644 (file)
index 0000000..008a806
--- /dev/null
+++ b/releases/2.7.1.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.7.1'
+project: 'aaf-authz'
+log_dir: 'aaf-authz-maven-stage-master/482/'

diff --git a/releases/2.7.2.yaml b/releases/2.7.2.yaml
new file mode 100644 (file)
index 0000000..eb2e65c
--- /dev/null
+++ b/releases/2.7.2.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.7.2'
+project: 'aaf-authz'
+log_dir: 'aaf-authz-maven-stage-master/506/'

diff --git a/releases/2.7.3.yaml b/releases/2.7.3.yaml
new file mode 100644 (file)
index 0000000..075f5c0
--- /dev/null
+++ b/releases/2.7.3.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.7.3'
+project: 'aaf-authz'
+log_dir: 'aaf-authz-maven-stage-master/512/'

diff --git a/releases/2.7.4.yaml b/releases/2.7.4.yaml
new file mode 100644 (file)
index 0000000..41a6188
--- /dev/null
+++ b/releases/2.7.4.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.7.4'
+project: 'aaf-authz'
+log_dir: 'aaf-authz-maven-stage-master/540/'

diff --git a/version.properties b/version.properties
index 77d490c..9575b61 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 # This TAG <version>2.7.0-SNAPSHOT</version> is here to help remember to change this file.  Keep it up to date with the following "real" entries:
 major=2
 minor=7
-patch=1
+patch=4
 
 base_version=${major}.${minor}.${patch}