rename rule template from beijing to casablanca

Changed assertTrue to assertEquals in CasablancaFeatureTest.

Change-Id: I3bec009ddde2f10468575b4b7bf9c08c24748aae
Issue-ID: POLICY-955
Signed-off-by: Jim Hahn <jrh3@att.com>

12 files changed, 23 insertions, 25 deletions

diff --git a/controlloop/common/controller-beijing/.gitignore b/controlloop/common/controller-beijing/.gitignore
deleted file mode 100644
index 2e1b1149f..000000000
--- a/controlloop/common/controller-beijing/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/main/resources/beijing.drl
diff --git a/controlloop/common/controller-casablanca/.gitignore b/controlloop/common/controller-casablanca/.gitignore
new file mode 100644
index 000000000..f4e96567c
--- /dev/null
+++ b/controlloop/common/controller-casablanca/.gitignore
@@ -0,0 +1 @@
+src/main/resources/casablanca.drl
diff --git a/controlloop/common/controller-beijing/pom.xml b/controlloop/common/controller-casablanca/pom.xml
index 7fe97a994..deeb5b346 100644
--- a/controlloop/common/controller-beijing/pom.xml
+++ b/controlloop/common/controller-casablanca/pom.xml
@@ -29,11 +29,11 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>controller-beijing</artifactId>
+    <artifactId>controller-casablanca</artifactId>
     <packaging>kjar</packaging>
 
     <name>${project.artifactId}</name>
-    <description>Beijing Experimental Controller</description>
+    <description>Casablanca Experimental Controller</description>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -62,9 +62,9 @@
                         </goals>
                         <configuration>
                             <sourceFile>
-                                ../../templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+                                ../../templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
                             </sourceFile>
-                            <destinationFile>src/main/resources/beijing.drl</destinationFile>
+                            <destinationFile>src/main/resources/casablanca.drl</destinationFile>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml b/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml
index fb96d70fd..3c2030da9 100644
--- a/controlloop/common/controller-beijing/src/main/resources/META-INF/kmodule.xml
+++ b/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml
@@ -20,6 +20,6 @@
   -->
 <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
     <kbase name="rules">
-        <ksession name="beijing"/>
+        <ksession name="casablanca"/>
     </kbase>
 </kmodule>
diff --git a/controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI b/controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 93439489c..000000000
--- a/controlloop/common/feature-controlloop-beijing/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.onap.policy.drools.apps.controlloop.feature.beijing.BeijingFeature
diff --git a/controlloop/common/feature-controlloop-beijing/pom.xml b/controlloop/common/feature-controlloop-casablanca/pom.xml
index 33aca1772..dd60243c0 100644
--- a/controlloop/common/feature-controlloop-beijing/pom.xml
+++ b/controlloop/common/feature-controlloop-casablanca/pom.xml
@@ -28,10 +28,10 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>feature-controlloop-beijing</artifactId>
+    <artifactId>feature-controlloop-casablanca</artifactId>
 
     <description>
-        Load Experimental Beijing Control Loop Use Cases Controller as a feature.
+        Load Experimental Casablanca Control Loop Use Cases Controller as a feature.
     </description>
 
     <properties>
diff --git a/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml
index f549cfc91..7cb637918 100644
--- a/controlloop/common/feature-controlloop-beijing/src/assembly/assemble_zip.xml
+++ b/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml
@@ -24,7 +24,7 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>feature-controlloop-beijing-package</id>
+	<id>feature-controlloop-casablanca-package</id>
 	<formats>
 		<format>zip</format>
 	</formats>
@@ -36,7 +36,7 @@
 			<directory>target</directory>
 			<outputDirectory>lib/feature</outputDirectory>
 			<includes>
-				<include>feature-controlloop-beijing-${project.version}.jar</include>
+				<include>feature-controlloop-casablanca-${project.version}.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
diff --git a/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
index 787e90f0c..5d1a0a3c6 100644
--- a/controlloop/common/feature-controlloop-beijing/src/main/feature/config/beijing-controller.properties
+++ b/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-controller.name=beijing
+controller.name=casablanca
 
 ueb.source.topics=${{PDPD_CONFIGURATION_TOPIC}},${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE
 
@@ -71,5 +71,5 @@ ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlL
 ueb.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
 
 rules.groupId=${project.groupId}
-rules.artifactId=controller-beijing
+rules.artifactId=controller-casablanca
 rules.version=${project.version}
diff --git a/controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java b/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java
index 6f2a03c77..79bef2326 100644
--- a/controlloop/common/feature-controlloop-beijing/src/main/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeature.java
+++ b/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.drools.apps.controlloop.feature.beijing;
+package org.onap.policy.drools.apps.controlloop.feature.casablanca;
 
 import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
 
 /**
- * Beijing installation as a feature saves time
- * loading the Beijing controller at runtime over the
+ * Casablanca installation as a feature saves time
+ * loading the Casablanca controller at runtime over the
  * usual installation from nexus.  It also reduces
  * potential for errors in the pom.xml generated in
  * the brmsgw side.
@@ -36,7 +36,7 @@ import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
  * functionality
  *
  */
-public class BeijingFeature implements PolicyEngineFeatureAPI {
+public class CasablancaFeature implements PolicyEngineFeatureAPI {
 
     public static final int SEQNO = 1000;
 
diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI b/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644
index 000000000..5252ca115
--- /dev/null
+++ b/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
@@ -0,0 +1 @@
+org.onap.policy.drools.apps.controlloop.feature.casablanca.CasablancaFeature
diff --git a/controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java b/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java
index 66e5a3e02..8960603ae 100644
--- a/controlloop/common/feature-controlloop-beijing/src/test/java/org/onap/policy/drools/apps/controlloop/feature/beijing/BeijingFeatureTest.java
+++ b/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java
@@ -17,16 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.policy.drools.apps.controlloop.feature.beijing;
+package org.onap.policy.drools.apps.controlloop.feature.casablanca;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
-import org.onap.policy.drools.apps.controlloop.feature.beijing.BeijingFeature;
-
-public class BeijingFeatureTest {
+public class CasablancaFeatureTest {
 
     @org.junit.Test
     public void getSequenceNumber() {
-        assertTrue(new BeijingFeature().getSequenceNumber() == BeijingFeature.SEQNO);
+        assertEquals(CasablancaFeature.SEQNO, new CasablancaFeature().getSequenceNumber());
     }
 }
diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml
index ae318d626..5e3b3de37 100644
--- a/controlloop/common/pom.xml
+++ b/controlloop/common/pom.xml
@@ -39,11 +39,11 @@
     <module>model-impl</module>
     <module>policy-yaml</module>
     <module>simulators</module>
-    <module>controller-beijing</module>
+    <module>controller-casablanca</module>
     <module>feature-controlloop-utils</module>
     <module>feature-controlloop-trans</module>
     <module>feature-controlloop-amsterdam</module>
-    <module>feature-controlloop-beijing</module>
+    <module>feature-controlloop-casablanca</module>
     <module>msb</module>
   </modules>