Rename TOSCA Control Loop to ACM

This commit renames the TOSCA Control Loop functionality in CLAMP to
Automation Composition Management.

This review is a direct renaming review and, as everything is renamed
together it is large.

Issue-ID: POLICY-3939
Change-Id: I28f0a6dd889bf3570a4c1365ae9e71fc58db6d6c
Signed-off-by: liamfallon <liam.fallon@est.tech>

6 files changed, 22 insertions, 25 deletions

diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml
index 08511e03f..6415d2d79 100644
--- a/packages/policy-clamp-docker/pom.xml
+++ b/packages/policy-clamp-docker/pom.xml
@@ -92,10 +92,10 @@
 
                     <images>
                         <image>
-                            <name>onap/policy-clamp-cl-runtime</name>
+                            <name>onap/policy-clamp-runtime-acm</name>
                             <build>
                                 <cleanup>try</cleanup>
-                                <dockerFile>ClRuntimeDockerfile</dockerFile>
+                                <dockerFile>AcmRuntimeDockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
@@ -109,11 +109,11 @@
                                                     <include>org.onap.policy.clamp:policy-clamp-tarball</include>
                                                 </includes>
                                                 <outputDirectory>/lib</outputDirectory>
-                                                <outputFileNameMapping>policy-controlloop-runtime.tar.gz</outputFileNameMapping>
+                                                <outputFileNameMapping>policy-clamp-runtime-acm.tar.gz</outputFileNameMapping>
                                             </dependencySet>
                                             <dependencySet>
                                                 <includes>
-                                                    <include>org.onap.policy.clamp:policy-clamp-runtime-controlloop</include>
+                                                    <include>org.onap.policy.clamp:policy-clamp-runtime-acm</include>
                                                 </includes>
                                                 <outputFileNameMapping>app.jar</outputFileNameMapping>
                                             </dependencySet>
@@ -123,8 +123,8 @@
                             </build>
                         </image>
                         <image>
-                            <name>onap/policy-clamp-cl-pf-ppnt</name>
-                            <alias>onap-policy-clamp-cl-pf-ppnt</alias>
+                            <name>onap/policy-clamp-ac-pf-ppnt</name>
+                            <alias>onap-policy-clamp-ac-pf-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>PolicyParticipantDockerfile</dockerFile>
@@ -155,8 +155,8 @@
                             </build>
                         </image>
                         <image>
-                            <name>onap/policy-clamp-cl-k8s-ppnt</name>
-                            <alias>onap-policy-clamp-cl-k8s-ppnt</alias>
+                            <name>onap/policy-clamp-ac-k8s-ppnt</name>
+                            <alias>onap-policy-clamp-ac-k8s-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>KubernetesParticipantDockerfile</dockerFile>
@@ -187,8 +187,8 @@
                             </build>
                         </image>
                         <image>
-                            <name>onap/policy-clamp-cl-http-ppnt</name>
-                            <alias>onap-policy-clamp-cl-http-ppnt</alias>
+                            <name>onap/policy-clamp-ac-http-ppnt</name>
+                            <alias>onap-policy-clamp-ac-http-ppnt</alias>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>HttpParticipantDockerfile</dockerFile>
@@ -248,9 +248,6 @@
                             <goal>build</goal>
                             <goal>push</goal>
                         </goals>
-                        <configuration>
-                            <image>onap/policy-clamp</image>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
index b66fddcc4..021a58676 100644
--- a/packages/policy-clamp-docker/src/main/docker/ClRuntimeDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntimeDockerfile
@@ -19,7 +19,7 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM runtime on Java 11 or better in alpine
 #
 FROM onap/policy-jre-alpine:2.4.0
 
@@ -33,13 +33,13 @@ ENV POLICY_HOME=$POLICY_HOME/clamp
 RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \
     chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \
     mkdir /packages
-COPY /maven/lib/policy-controlloop-runtime.tar.gz /packages
+COPY /maven/lib/policy-clamp-runtime-acm.tar.gz /packages
 
-RUN tar xvfz /packages/policy-controlloop-runtime.tar.gz --directory $POLICY_HOME && \
-    rm /packages/policy-controlloop-runtime.tar.gz
+RUN tar xvfz /packages/policy-clamp-runtime-acm.tar.gz --directory $POLICY_HOME && \
+    rm /packages/policy-clamp-runtime-acm.tar.gz
 
 WORKDIR $POLICY_HOME
-COPY controlloop-runtime.sh  bin/.
+COPY acm-runtime.sh  bin/.
 COPY /maven/app.jar /app
 
 RUN chown -R policy:policy * && \
@@ -50,4 +50,4 @@ EXPOSE 6969
 
 USER policy
 WORKDIR $POLICY_HOME/bin
-ENTRYPOINT [ "./controlloop-runtime.sh" ]
+ENTRYPOINT [ "./acm-runtime.sh" ]
diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
index 2497f5d3b..b6f2c44eb 100644
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipantDockerfile
@@ -19,7 +19,7 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM HTTP Participant on Java 11 or better in alpine
 #
 
 FROM onap/policy-jre-alpine:2.4.0
diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
index e7fc89021..688e68d09 100644
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
@@ -19,7 +19,7 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM K8S Participant on Java 11 or better in alpine
 #
 FROM onap/policy-jre-alpine:2.4.0
 
diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
index a0d003292..50d4210bf 100644
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipantDockerfile
@@ -19,7 +19,7 @@
 #-------------------------------------------------------------------------------
 
 #
-# Docker file to build an image that runs CLAMP on Java 11 or better in alpine
+# Docker file to build an image that runs the CLAMP ACM Policy Framework Participant on Java 11 or better in alpine
 #
 FROM onap/policy-jre-alpine:2.4.0
 
diff --git a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
index c428fd553..84550de82 100644
--- a/packages/policy-clamp-docker/src/main/docker/controlloop-runtime.sh
+++ b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
@@ -32,7 +32,7 @@ else
 fi
 
 if [ -z "$CONFIG_FILE" ]; then
-    CONFIG_FILE="${POLICY_HOME}/etc/ClRuntimeParameters.yaml"
+    CONFIG_FILE="${POLICY_HOME}/etc/AcRuntimeParameters.yaml"
 fi
 
 echo "Policy clamp config file: $CONFIG_FILE"
@@ -54,7 +54,7 @@ fi
 
 touch /app/app.jar
 mkdir -p "${POLICY_HOME}"/config/
-cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/ClRuntimeParameters.yaml
+cp -f "${CONFIG_FILE}" "${POLICY_HOME}"/config/AcRuntimeParameters.yaml
 
 $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
     -Dserver.ssl.keyStore="${KEYSTORE}" \
@@ -68,4 +68,4 @@ $JAVA_HOME/bin/java -Dserver.ssl.enabled="true" \
     -Dcom.sun.management.jmxremote.authenticate=false \
     -Dcom.sun.management.jmxremote.local.only=false \
     -jar /app/app.jar \
-    --spring.config.location="${POLICY_HOME}/config/ClRuntimeParameters.yaml"
+    --spring.config.location="${POLICY_HOME}/config/AcRuntimeParameters.yaml"