Fix errors found no Container mode

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

diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 76fe2a1..c7a1346 100644 (file)
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -61,6 +61,14 @@
                        <artifactId>aaf-auth-cass</artifactId>
                </dependency>
 
+                <!-- Add the Organizations you wish to support. You can delete ONAP if
+                        you have something else Match with Property Entry: Organization.<root ns>,
+                        i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
+                <dependency>
+                        <groupId>org.onap.aaf.authz</groupId>
+                        <artifactId>aaf-auth-deforg</artifactId>
+                </dependency>
+
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>

diff --git a/auth/sample/etc/org.osaaf.aaf.locate.props b/auth/sample/etc/org.osaaf.aaf.locate.props
index 90c2c57..25d6217 100644 (file)
--- a/auth/sample/etc/org.osaaf.aaf.locate.props
+++ b/auth/sample/etc/org.osaaf.aaf.locate.props
@@ -2,7 +2,7 @@
 ## org.osaaf.aaf.locate 
 ## AAF Locator Properties
 ##
-cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opts/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
+cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
 aaf_component=AAF_NS.locator:2.1.2
 port=8095
 

diff --git a/conf/CA/truststore.sh b/conf/CA/truststore.sh
index 399048c..0414c48 100644 (file)
--- a/conf/CA/truststore.sh
+++ b/conf/CA/truststore.sh
@@ -1,2 +1,5 @@
+
 echo "FYI, by convention, truststore passwords are 'changeit', but you may add something more sophisticated"
-openssl pkcs12 -export -name AAF_Root_CA -in certs/ca.crt -nokeys -out truststore.p12
+# PCKS12 does not appear to be able to mark CAs as Trusted
+# openssl pkcs12 -export -name AAF_Root_CA -in certs/ca.crt -nokeys -out truststore.p12
+keytool -importcert -file certs/ca.crt -trustcacerts -alias AAF_ROOT_CA -keystore truststore.jks