Create Functioning Client Sample for Docs

Issue-ID: AAF-221
Change-Id: Iaefe6700a900a712409bda7ddfd18932ed4c0fda
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>

7 files changed, 12 insertions, 20 deletions

diff --git a/auth/.gitignore b/auth/.gitignore
index 199008cd..3ff6f78c 100644
--- a/auth/.gitignore
+++ b/auth/.gitignore
@@ -2,3 +2,4 @@
 /.project
 /target/
 /aaf_*
+/deploy.gz
diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh
index 9362896d..3726b6d2 100644
--- a/auth/auth-cass/docker/dinstall.sh
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -1,4 +1,3 @@
-#!/bin/bash dinstall
 if ["`docker ps -a | grep aaf_cass`" == ""]; then
   docker run --name aaf_cass  -d cassandra:3.11
   echo "Check for running Docker Container aaf_cass, then run again."
@@ -8,6 +7,7 @@ else
   docker cp "../src/main/cql/." aaf_cass:/opt/app/cass_init
 fi 
 
+
 echo "Docker Installed Basic Cassandra on aaf_cass.  Executing the following "
 echo "NOTE: This creator provided is only a Single Instance. For more complex Cassandra, create independently"
 echo ""
diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_JettyServiceStarter.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_JettyServiceStarter.java
index 39af2568..9a02b634 100644
--- a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_JettyServiceStarter.java
+++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_JettyServiceStarter.java
@@ -51,9 +51,9 @@ import org.mockito.Mock;
 public class JU_JettyServiceStarter {
 	private PropAccess propAccess = new PropAccess();
 	private JettyServiceStarter<AuthzEnv,AuthzTrans> jss;
-	class TestService extends AbsService{
+	class TestService extends AbsService<AuthzEnv,AuthzTrans>{
 
-		public TestService(Access access, BasicEnv env) throws CadiException {
+		public TestService(Access access, AuthzEnv env) throws CadiException {
 			super(access, env);
 			// TODO Auto-generated constructor stub
 		}
@@ -65,11 +65,11 @@ public class JU_JettyServiceStarter {
 		}
 
 		@Override
-		public Registrant[] registrants(int port) throws CadiException, LocatorException {
+		public Registrant<AuthzEnv>[] registrants(int port) throws CadiException, LocatorException {
 			// TODO Auto-generated method stub
 			return null;
 		}
-		
+
 	}
 	@SuppressWarnings("unchecked")
 	@Before
diff --git a/auth/docker/Dockerfile b/auth/docker/Dockerfile
index f2920de5..729a460e 100644
--- a/auth/docker/Dockerfile
+++ b/auth/docker/Dockerfile
@@ -15,11 +15,10 @@ COPY lib /opt/app/aaf/${AAF_COMPONENT}/lib
 COPY theme /opt/app/aaf/${AAF_COMPONENT}/theme
 COPY bin /opt/app/aaf/${AAF_COMPONENT}/bin
 
-CMD ["/bin/bash","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
+#CMD ["/bin/bash","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
 
 # For Debugging installation
-# CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT};cat /etc/hosts"]
-#CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT};cat /etc/hosts;/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
+CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT};cat /etc/hosts;/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
 # Java Debugging VM Args
 #     "-Xdebug",\
 #     "-Xnoagent",\
diff --git a/auth/docker/d.props b/auth/docker/d.props
index 08a96348..b955872a 100644
--- a/auth/docker/d.props
+++ b/auth/docker/d.props
@@ -7,7 +7,7 @@ CONF_ROOT_DIR=/opt/app/osaaf
 
 # Local Env info
 HOSTNAME=meriadoc.mithril.sbc.com
-HOST_IP=192.168.99.102
+HOST_IP=192.168.99.100
 CASS_HOST=cass.aaf.osaaf.org:172.17.0.2
 
 
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index ace2e507..23fa72f5 100644
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -3,11 +3,7 @@
 # Docker Building Script.  Reads all the components generated by install, on per-version basis
 #
 # Pull in Variables from d.props
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-./d.props
+. ./d.props
 # TODO add ability to do DEBUG settings
 
 if ["$1" == ""]; then
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 33f3014d..2b5f709a 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,9 +1,5 @@
 #!/bin/bash drun.sh
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
-./d.props
+. ./d.props
 
 
 if [ "$1" == "" ]; then
@@ -52,5 +48,5 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
 	  ${LINKS} \
 	  --publish $PORTMAP \
 	  --mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \
-	  ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
+	  ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} 
 done