remove jwsdp references, since uddi-registry is no longer required.

Signed-off-by: gurunandan.rao@oracle.com <gurunandan.rao@oracle.com>
scottmarlow · Mar 3, 2021 · f5737e7 · f5737e7
1 parent 585a6fd
commit f5737e7
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 86 deletions.
diff --git a/docker/run_jakartaeetck.sh b/docker/run_jakartaeetck.sh
@@ -71,19 +71,6 @@ if [ -z "$IMAP_PORT" ]; then
 fi
 ##################################################
 
-# Set JWSDP install dir and UDDI Registry server url 
-# required for JAXR tests if not set.
-if [ -z "$UDDI_REGISTRY_URL" ]; then
-  export UDDI_REGISTRY_URL="http://localhost:8080/RegistryServer/"
-fi
-
-if [ -z "$JWSDP_HOME" ]; then
-  export  JWSDP_HOME="/opt/jwsdp-1.3"
-fi
-
-##################################################
-
-
 
 printf  "
 ******************************************************

diff --git a/docker/scripts/cts/Dockerfile b/docker/scripts/cts/Dockerfile
@@ -3,21 +3,16 @@ FROM centos:7
 RUN mkdir /tmp/cts
 ENV CTS_HOME /tmp/cts
 WORKDIR ${CTS_HOME}
-RUN mkdir /tmp/cts/jwsdp
-ENV JWSDP_HOME /tmp/cts/jwsdp
 
 ARG JDK_BUNDLE_URL
 ARG CTS_BUNDLE_URL
 ARG GLASSFISH_BUNDLE_URL
-ARG JWSDP_BUNDLE
-ARG JDK_FOR_JWSDP
 ARG http_proxy
 ARG test_suite
 
-COPY docker-setup.sh docker-entrypoint.sh killJava.sh admin-password.txt change-admin-password.txt jwsdp-setup.sh ${CTS_HOME}/
+COPY docker-setup.sh docker-entrypoint.sh killJava.sh admin-password.txt change-admin-password.txt ${CTS_HOME}/
 
 RUN ${CTS_HOME}/docker-setup.sh
-RUN ${CTS_HOME}/jwsdp-setup.sh
 
 ENV JAVA_HOME $CTS_HOME/jdk1.8.0_171
 ENV ANT_HOME $CTS_HOME/apache-ant-1.9.7

diff --git a/docker/scripts/cts/docker-entrypoint.sh b/docker/scripts/cts/docker-entrypoint.sh
@@ -202,11 +202,6 @@ $CTS_HOME/ri/glassfish6/glassfish/bin/asadmin --user admin --passwordfile admin-
 $CTS_HOME/ri/glassfish6/glassfish/bin/asadmin --user admin --passwordfile admin-password.txt -p $PORT start-domain
 ### restartRI.sh ends here #####
 
-echo "Starting Java Web Services Developer Pack ..."
-cd $JWSDP_HOME/jwsdp-1.3/bin
-./startup.sh &
-echo "Java Web Services Developer Pack started ..."
-
 ### ctsStartStandardDeploymentServer.sh starts here #####
 
 cd $TS_HOME/bin;

diff --git a/docker/scripts/cts/jwsdp-setup.sh b/docker/scripts/cts/jwsdp-setup.sh
diff --git a/docker/scripts/tcks/Dockerfile b/docker/scripts/tcks/Dockerfile
@@ -2,16 +2,12 @@ FROM centos:7
 
 RUN mkdir /tmp/tck
 ENV TCK_HOME /tmp/tck
-RUN mkdir /tmp/tck/jwsdp
-ENV JWSDP_HOME /tmp/tck/jwsdp
 
 WORKDIR ${TCK_HOME}
 
 ARG JDK_BUNDLE_URL
 ARG TCK_BUNDLE_URL
 ARG GLASSFISH_BUNDLE_URL
-ARG JWSDP_BUNDLE
-ARG JDK_FOR_JWSDP
 ARG http_proxy
 
 COPY docker-setup.sh docker-entrypoint.sh killJava.sh ${TCK_HOME}/

diff --git a/docker/scripts/tcks/docker-setup.sh b/docker/scripts/tcks/docker-setup.sh
@@ -40,16 +40,3 @@ tar -zxf jdk-8u171-linux-x64.tar.gz
 echo "Download and install Apache Ant v 1.9.7 ..."
 wget https://<apachehost>/apache-ant-1.9.7-bin.tar.gz
 tar -zxf apache-ant-1.9.7-bin.tar.gz
-
-echo "Download Java Web Services Developer Pack 1.3 and JDK 1.5 required for that ..."
-if [ "$JWSDP_BUNDLE" == "dummy" ];then
-  wget http://<host>/jwsdp-1.3.tar
-else
-  wget $JWSDP_BUNDLE -O jwsdp-1.3.tar
-fi
-
-if [ "$JDK_FOR_JWSDP" == "dummy" ];then
-  wget http://<jdkhost>/jdk1.5.0_22.tar
-else
-  wget $JDK_FOR_JWSDP -O jdk1.5.0_22.tar
-fi