Fix GUI image locations

Issue-ID: AAF-902
Change-Id: Id650f1661ef6085e57ee5b10b02aedf56900e5c7
Signed-off-by: Instrumental <jonathan.gathman@att.com>

21 files changed, 16 insertions, 4 deletions

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CacheInfoDAO.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CacheInfoDAO.java
index 8cb25ac7..0ad15277 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CacheInfoDAO.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cass/CacheInfoDAO.java
@@ -47,6 +47,7 @@ import org.onap.aaf.cadi.SecuritySetter;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
 import org.onap.aaf.cadi.client.Retryable;
+import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.http.HMangr;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Env;
@@ -69,20 +70,32 @@ public class CacheInfoDAO extends CassDAOImpl<AuthzTrans,CacheInfoDAO.Data> impl
     
     // Hold current time stamps from Tables
     private final Date startTime;
+	private final boolean cacheNotify;
     private PreparedStatement psCheck;
     
     public CacheInfoDAO(AuthzTrans trans, Cluster cluster, String keyspace) throws APIException, IOException {
         super(trans, CacheInfoDAO.class.getSimpleName(),cluster,keyspace,Data.class,TABLE,readConsistency(trans,TABLE), writeConsistency(trans,TABLE));
         startTime = new Date();
+        cacheNotify = noK8s(trans);
         init(trans);
     }
 
-    public CacheInfoDAO(AuthzTrans trans, AbsCassDAO<AuthzTrans,?> aDao) throws APIException, IOException {
+	public CacheInfoDAO(AuthzTrans trans, AbsCassDAO<AuthzTrans,?> aDao) throws APIException, IOException {
         super(trans, CacheInfoDAO.class.getSimpleName(),aDao,Data.class,TABLE,readConsistency(trans,TABLE), writeConsistency(trans,TABLE));
         startTime = new Date();
         init(trans);
+        cacheNotify = noK8s(trans);
     }
 
+	/** 
+	 * Need a different point to point cache clear strategy for K8s... 
+	 * @param trans
+	 * @return
+	 */
+    private boolean noK8s(AuthzTrans trans) {
+    	String container = trans.getProperty(Config.AAF_LOCATOR_CONTAINER);
+    	return ! ("helm".equals(container) || "oom".equals(container));
+	}
 
     //////////////////////////////////////////
     // Data Definition, matches Cassandra DM
@@ -328,7 +341,6 @@ public class CacheInfoDAO extends CassDAOImpl<AuthzTrans,CacheInfoDAO.Data> impl
     }
 
     private void init(AuthzTrans trans) throws APIException, IOException {
-        
         String[] helpers = setCRUD(trans, TABLE, Data.class, InfoLoader.dflt);
         psCheck = getSession(trans).prepare(SELECT_SP +  helpers[FIELD_COMMAS] + " FROM " + TABLE);
 
@@ -347,7 +359,7 @@ public class CacheInfoDAO extends CassDAOImpl<AuthzTrans,CacheInfoDAO.Data> impl
         /////////////
         // ConcurrentQueues are open-ended.  We don't want any Memory leaks 
         // Note: we keep a separate counter, because "size()" on a Linked Queue is expensive
-        if (cacheUpdate!=null) {
+        if (cacheNotify && cacheUpdate!=null) {
             try {
                 if (!CacheUpdate.notifyDQ.offer(new CacheUpdate.Transfer(name, seg),2,TimeUnit.SECONDS)) {
                     trans.error().log("Cache Notify Queue is not accepting messages, bouncing may be appropriate" );
diff --git a/auth/auth-gui/theme/onap/LF_Collab_footer_gray.png b/auth/auth-gui/theme/onap/LF_Collab_footer_gray.png
deleted file mode 100644
index abbf4b1a..00000000
--- a/auth/auth-gui/theme/onap/LF_Collab_footer_gray.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/LF_Collab_footer_gray_stripe.png b/auth/auth-gui/theme/onap/LF_Collab_footer_gray_stripe.png
deleted file mode 100644
index fb9b37a2..00000000
--- a/auth/auth-gui/theme/onap/LF_Collab_footer_gray_stripe.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/LF_Collab_header_gray.png b/auth/auth-gui/theme/onap/LF_Collab_header_gray.png
deleted file mode 100644
index 43781fad..00000000
--- a/auth/auth-gui/theme/onap/LF_Collab_header_gray.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/ONAP_LOGO.png b/auth/auth-gui/theme/onap/ONAP_LOGO.png
deleted file mode 100644
index 55e37188..00000000
--- a/auth/auth-gui/theme/onap/ONAP_LOGO.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/images/AAF_details.png b/auth/auth-gui/theme/onap/images/AAF_details.png
deleted file mode 100644
index 5c187459..00000000
--- a/auth/auth-gui/theme/onap/images/AAF_details.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/images/AAF_font_size.png b/auth/auth-gui/theme/onap/images/AAF_font_size.png
deleted file mode 100644
index 466cbfbc..00000000
--- a/auth/auth-gui/theme/onap/images/AAF_font_size.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/images/AAF_maximize.png b/auth/auth-gui/theme/onap/images/AAF_maximize.png
deleted file mode 100644
index 706603bb..00000000
--- a/auth/auth-gui/theme/onap/images/AAF_maximize.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/images/AAFdownload.png b/auth/auth-gui/theme/onap/images/AAFdownload.png
deleted file mode 100644
index cebd9522..00000000
--- a/auth/auth-gui/theme/onap/images/AAFdownload.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/images/AAFemail.png b/auth/auth-gui/theme/onap/images/AAFemail.png
deleted file mode 100644
index 6d487769..00000000
--- a/auth/auth-gui/theme/onap/images/AAFemail.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/images/ONAP_LOGO.png b/auth/auth-gui/theme/onap/images/ONAP_LOGO.png
index 55e37188..458e320c 100644
--- a/auth/auth-gui/theme/onap/images/ONAP_LOGO.png
+++ b/auth/auth-gui/theme/onap/images/ONAP_LOGO.png
diff --git a/auth/auth-gui/theme/onap/AAF_details.png b/auth/auth-gui/theme/onap/images/icons/AAF_details.png
index 5c187459..5c187459 100644
--- a/auth/auth-gui/theme/onap/AAF_details.png
+++ b/auth/auth-gui/theme/onap/images/icons/AAF_details.png
diff --git a/auth/auth-gui/theme/onap/AAFdownload.png b/auth/auth-gui/theme/onap/images/icons/AAF_download.png
index cebd9522..cebd9522 100644
--- a/auth/auth-gui/theme/onap/AAFdownload.png
+++ b/auth/auth-gui/theme/onap/images/icons/AAF_download.png
diff --git a/auth/auth-gui/theme/onap/AAFemail.png b/auth/auth-gui/theme/onap/images/icons/AAF_email.png
index 6d487769..6d487769 100644
--- a/auth/auth-gui/theme/onap/AAFemail.png
+++ b/auth/auth-gui/theme/onap/images/icons/AAF_email.png
diff --git a/auth/auth-gui/theme/onap/AAF_font_size.png b/auth/auth-gui/theme/onap/images/icons/AAF_font_size.png
index 466cbfbc..466cbfbc 100644
--- a/auth/auth-gui/theme/onap/AAF_font_size.png
+++ b/auth/auth-gui/theme/onap/images/icons/AAF_font_size.png
diff --git a/auth/auth-gui/theme/onap/AAF_maximize.png b/auth/auth-gui/theme/onap/images/icons/AAF_maximize.png
index 706603bb..706603bb 100644
--- a/auth/auth-gui/theme/onap/AAF_maximize.png
+++ b/auth/auth-gui/theme/onap/images/icons/AAF_maximize.png
diff --git a/auth/auth-gui/theme/onap/options_down.png b/auth/auth-gui/theme/onap/images/icons/options_down.png
index a20e8269..a20e8269 100644
--- a/auth/auth-gui/theme/onap/options_down.png
+++ b/auth/auth-gui/theme/onap/images/icons/options_down.png
diff --git a/auth/auth-gui/theme/onap/options_up.png b/auth/auth-gui/theme/onap/images/icons/options_up.png
index 7414dab5..7414dab5 100644
--- a/auth/auth-gui/theme/onap/options_up.png
+++ b/auth/auth-gui/theme/onap/images/icons/options_up.png
diff --git a/auth/auth-gui/theme/onap/images/logo_onap.png b/auth/auth-gui/theme/onap/images/logo_onap.png
deleted file mode 100644
index 458e320c..00000000
--- a/auth/auth-gui/theme/onap/images/logo_onap.png
+++ /dev/null
diff --git a/auth/auth-gui/theme/onap/logo_onap.png b/auth/auth-gui/theme/onap/logo_onap.png
deleted file mode 100644
index 458e320c..00000000
--- a/auth/auth-gui/theme/onap/logo_onap.png
+++ /dev/null
diff --git a/auth/docker/Dockerfile.core b/auth/docker/Dockerfile.core
index a8aa543b..5c66c8ca 100644
--- a/auth/docker/Dockerfile.core
+++ b/auth/docker/Dockerfile.core
@@ -28,7 +28,7 @@ LABEL version=${AAF_VERSION}
 
 COPY lib /opt/app/aaf/lib
 COPY bin /opt/app/aaf/bin
-COPY theme /opt/app/aaf/theme
+COPY theme/ /opt/app/aaf/theme/
 
 RUN mkdir -p /opt/app/osaaf &&\
     mkdir -p /opt/app/aaf/status &&\