24 files changed, 88 insertions, 76 deletions

diff --git a/bpmn/MSOURN-plugin/pom.xml b/bpmn/MSOURN-plugin/pom.xml
index 5ad57a6096..6022f4865b 100644
--- a/bpmn/MSOURN-plugin/pom.xml
+++ b/bpmn/MSOURN-plugin/pom.xml
@@ -16,12 +16,11 @@
 	<name>MSO URN Mapping Cockpit Plugin</name>
 
 	<dependencies>
-		<!--  TODO Upate it to ee and proper version-->
 		<dependency>
-			<groupId>org.camunda.bpm.webapp</groupId>
-			<artifactId>camunda-webapp-core</artifactId>
-			<version>${camunda.version}</version>
-			<!-- exclusion to use latest commons-fileupload -->
+		    <groupId>org.camunda.bpm.webapp</groupId>
+            <artifactId>camunda-webapp</artifactId>
+            <classifier>classes</classifier>
+            <version>${camunda.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-fileupload</groupId>
@@ -29,7 +28,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- latest commons-fileupload -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
@@ -52,11 +50,6 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<version>3.0.1</version>
@@ -68,5 +61,11 @@
 			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+             <groupId>org.evosuite</groupId>
+             <artifactId>evosuite-standalone-runtime</artifactId>
+             <version>${evosuiteVersion}</version>
+             <scope>test</scope>
+        </dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/URNMapPlugin.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java
index 9a02aa0c38..fc08d2d54e 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/URNMapPlugin.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPlugin.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap;
+package org.openecomp.camunda.bpmn.plugin.urnmap;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -26,8 +26,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.camunda.bpm.cockpit.plugin.spi.impl.AbstractCockpitPlugin;
-
-import com.att.camunda.bpm.plugin.urnmap.resources.URNMapPluginRootResource;
+import org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNMapPluginRootResource;
 
  
 
@@ -49,6 +48,6 @@ public class URNMapPlugin  extends AbstractCockpitPlugin{
 
 	  @Override
 	  public List<String> getMappingFiles() {
-		  return Arrays.asList("com/att/camunda/bpm/plugin/urnmap/queries/urnMap.xml");
+		  return Arrays.asList("org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml");
 	  }
 }
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/MyBatisExtendedSessionFactory.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
index 8a9d136dd6..728042008d 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/MyBatisQueryCommandExecutor.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisQueryCommandExecutor.java
index 0bd7d739c5..e7140cd318 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/MyBatisQueryCommandExecutor.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisQueryCommandExecutor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.camunda.bpm.engine.impl.interceptor.Command;
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/URNData.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNData.java
index f8396bb223..ac8b2e15ee 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/URNData.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNData.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 public class URNData {
 
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/URNService.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNService.java
index 7fd41c131d..3838343aba 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/db/URNService.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNService.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 import java.util.List;
 
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/resources/ProcessInstanceResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java
index 44fe47b053..4a155809e5 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/resources/ProcessInstanceResource.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResource.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import java.util.List;
 import java.util.StringTokenizer;
@@ -29,10 +29,8 @@ import javax.ws.rs.PUT;
 
 import org.camunda.bpm.cockpit.db.QueryParameters;
 import org.camunda.bpm.cockpit.plugin.resource.AbstractPluginResource;
-import com.att.camunda.bpm.plugin.urnmap.db.*;
 import org.camunda.bpm.cockpit.db.CommandExecutor;
-
-import com.att.camunda.bpm.plugin.urnmap.db.URNData;
+import org.openecomp.camunda.bpmn.plugin.urnmap.db.*;
 
 public class ProcessInstanceResource extends AbstractPluginResource {
 
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/resources/URNMapPluginRootResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResource.java
index c30eb8d8d7..d31fec66b9 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/resources/URNMapPluginRootResource.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResource.java
@@ -18,14 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
 import org.camunda.bpm.cockpit.plugin.resource.AbstractPluginRootResource;
-
-import com.att.camunda.bpm.plugin.urnmap.URNMapPlugin;
+import org.openecomp.camunda.bpmn.plugin.urnmap.URNMapPlugin;
 
 @SuppressWarnings("deprecation")
 @Path("plugin/" + URNMapPlugin.ID)
diff --git a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/resources/URNResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
index 08724db415..5838130a92 100644
--- a/bpmn/MSOURN-plugin/src/main/java/com/att/camunda/bpm/plugin/urnmap/resources/URNResource.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 /***
 import java.beans.Statement;
 import java.sql.DriverManager;
@@ -44,7 +44,7 @@ import org.camunda.bpm.cockpit.plugin.resource.AbstractCockpitPluginResource;
 
 
 //import org.camunda.bpm.cockpit.plugin.resource.AbstractPluginResource;
-import com.att.camunda.bpm.plugin.urnmap.db.URNData;
+import org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData;
 import org.openecomp.mso.logger.MsoLogger;
 
 
@@ -65,7 +65,7 @@ public class URNResource extends AbstractCockpitPluginResource{
 			
 		    conn = getDBConnection();
 			    PreparedStatement psData = conn
-						.prepareStatement("select * from ATT_URN_MAPPING order by NAME_");
+						.prepareStatement("select * from MSO_URN_MAPPING order by NAME_");
 			    
 			    ResultSet r = psData.executeQuery();
 			    
@@ -164,7 +164,7 @@ public class URNResource extends AbstractCockpitPluginResource{
 			
   		    conn = getDBConnection();
 			    PreparedStatement psData = conn
-						.prepareStatement("Insert into ATT_URN_MAPPING values ('" + key_ + "', '" + value_  + "', '1')");
+						.prepareStatement("Insert into MSO_URN_MAPPING values ('" + key_ + "', '" + value_  + "', '1')");
 			    
 			    psData.executeUpdate();
 			    
@@ -189,7 +189,7 @@ public class URNResource extends AbstractCockpitPluginResource{
 			
 		    conn = getDBConnection();
 			PreparedStatement psData = conn
-						.prepareStatement("UPDATE ATT_URN_MAPPING set VALUE_ ='"+ d.getURNValue() + "' WHERE NAME_='" + d.getURNName() + "'");
+						.prepareStatement("UPDATE MSO_URN_MAPPING set VALUE_ ='"+ d.getURNValue() + "' WHERE NAME_='" + d.getURNName() + "'");
 			    
 			    psData.executeUpdate();
 			    
diff --git a/bpmn/MSOURN-plugin/src/main/resources/META-INF/services/org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin b/bpmn/MSOURN-plugin/src/main/resources/META-INF/services/org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin
index 1e207d8022..9a5055af22 100644
--- a/bpmn/MSOURN-plugin/src/main/resources/META-INF/services/org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin
+++ b/bpmn/MSOURN-plugin/src/main/resources/META-INF/services/org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin
@@ -1 +1 @@
-com.att.camunda.bpm.plugin.urnmap.URNMapPlugin
\ No newline at end of file
+org.openecomp.camunda.bpm.plugin.urnmap.URNMapPlugin
\ No newline at end of file
diff --git a/bpmn/MSOURN-plugin/src/main/resources/mappings.xml b/bpmn/MSOURN-plugin/src/main/resources/mappings.xml
index d0a9177b7e..3141dfee4c 100644
--- a/bpmn/MSOURN-plugin/src/main/resources/mappings.xml
+++ b/bpmn/MSOURN-plugin/src/main/resources/mappings.xml
@@ -27,6 +27,6 @@
 		<setting name="lazyLoadingEnabled" value="false" />
 	</settings>
 	<mappers>
-        <mapper resource="com/att/camunda/bpm/plugin/urnmap/queries/urnMap.xml" />
+        <mapper resource="org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml" />
 	</mappers>
 </configuration>
diff --git a/bpmn/MSOURN-plugin/src/main/resources/com/att/camunda/bpm/plugin/urnmap/queries/urnMap.xml b/bpmn/MSOURN-plugin/src/main/resources/org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml
index ed610305ac..d0b58618e4 100644
--- a/bpmn/MSOURN-plugin/src/main/resources/com/att/camunda/bpm/plugin/urnmap/queries/urnMap.xml
+++ b/bpmn/MSOURN-plugin/src/main/resources/org/openecomp/camunda/bpm/plugin/urnmap/queries/urnMap.xml
@@ -23,39 +23,39 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="cockpit.urnMap">
-  <resultMap id="urnDataMap" type="com.att.camunda.bpm.plugin.urnmap.db.URNData">
+  <resultMap id="urnDataMap" type="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
     <result property="URNName" column="URNNAME" jdbcType="VARCHAR"/>
     <result property="URNValue" column="URNVALUE" jdbcType="VARCHAR" />
   </resultMap>
 
   <select id="retrieveUrnKeyValuePair" resultMap="urnDataMap">
-    select NAME_ URNName, VALUE_ URNValue from ATT_URN_MAPPING
+    select NAME_ URNName, VALUE_ URNValue from MSO_URN_MAPPING
   </select>
 
 
   <!-- INSERT cockpit.InsertURNData  keyProperty="NAME_" -->
-  <resultMap id="insertNewRow" type="com.att.camunda.bpm.plugin.urnmap.db.URNData">
+  <resultMap id="insertNewRow" type="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
     <result property="URNName" 	  column="NAME_" 	jdbcType="VARCHAR" />
     <result property="URNValue"   column="VALUE_"   jdbcType="VARCHAR" />
     <result property="1" 	      column="REV_" 	jdbcType="INTEGER"/>
   </resultMap>
   
-	<insert id="insertNewRow" parameterType="com.att.camunda.bpm.plugin.urnmap.db.URNData">
-	    insert into ATT_URN_MAPPING (NAME_, VALUE_, REV_) 
+	<insert id="insertNewRow" parameterType="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
+	    insert into MSO_URN_MAPPING (NAME_, VALUE_, REV_) 
 	    values (
 	    			#{URNName}, #{URNValue}, 1
 	          )
 	</insert>
 	
 <!-- UPDATE cockpit.InsertURNData -->
-  <resultMap id="saveURNMappingDataMap" type="com.att.camunda.bpm.plugin.urnmap.db.URNData">
+  <resultMap id="saveURNMappingDataMap" type="org.openecomp.camunda.bpm.plugin.urnmap.db.URNData">
     <result property="URNName" 	column="NAME_" 	jdbcType="VARCHAR" />
     <result property="URNValue"   column="VALUE_" jdbcType="VARCHAR" />
     <result property="1" 	    column="REV_" 	jdbcType="INTEGER"/>
   </resultMap>
   
   <update id="persistURNData">
-  update  ATT_URN_MAPPING set
+  update  MSO_URN_MAPPING set
     NAME_ = #{URNName},
     VALUE_ = #{URNValue},
     REV_ = 1
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/URNMapPluginESTest.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPluginESTest.java
index 0377b444be..386835c55d 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/URNMapPluginESTest.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPluginESTest.java
@@ -3,16 +3,19 @@
  * Mon Nov 14 13:49:02 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap;
+package org.openecomp.camunda.bpmn.plugin.urnmap;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.Set;
+
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.junit.runner.RunWith;
+import org.openecomp.camunda.bpmn.plugin.urnmap.URNMapPlugin;
 
 @RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
 public class URNMapPluginESTest extends URNMapPluginESTestscaffolding {
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/URNMapPluginESTestscaffolding.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPluginESTestscaffolding.java
index 472a2bc7e3..d01955f3fb 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/URNMapPluginESTestscaffolding.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/URNMapPluginESTestscaffolding.java
@@ -4,7 +4,7 @@
  * Mon Nov 14 13:49:02 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap;
+package org.openecomp.camunda.bpmn.plugin.urnmap;
 
 import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
 import org.junit.BeforeClass;
@@ -25,7 +25,7 @@ public class URNMapPluginESTestscaffolding {
 
   @BeforeClass 
   public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "com.att.camunda.bpm.plugin.urnmap.URNMapPlugin"; 
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.camunda.bpmn.plugin.urnmap.URNMapPlugin"; 
     org.evosuite.runtime.GuiSupport.initialize(); 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
@@ -75,9 +75,9 @@ public class URNMapPluginESTestscaffolding {
       "org.camunda.bpm.cockpit.plugin.spi.impl.AbstractCockpitPlugin",
       "org.camunda.bpm.webapp.plugin.resource.AbstractAppPluginRootResource",
       "org.camunda.bpm.cockpit.plugin.spi.CockpitPlugin",
-      "com.att.camunda.bpm.plugin.urnmap.resources.URNMapPluginRootResource",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNMapPluginRootResource",
       "org.camunda.bpm.cockpit.plugin.resource.AbstractCockpitPluginRootResource",
-      "com.att.camunda.bpm.plugin.urnmap.URNMapPlugin"
+      "org.openecomp.camunda.bpmn.plugin.urnmap.URNMapPlugin"
     );
   } 
 
@@ -85,7 +85,7 @@ public class URNMapPluginESTestscaffolding {
     org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(URNMapPluginESTestscaffolding.class.getClassLoader());
 
     org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "com.att.camunda.bpm.plugin.urnmap.URNMapPlugin"
+      "org.openecomp.camunda.bpmn.plugin.urnmap.URNMapPlugin"
     );
   }
 }
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNDataESTest.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNDataESTest.java
index c7b241c2d5..f42e2a49a4 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNDataESTest.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNDataESTest.java
@@ -3,14 +3,16 @@
  * Mon Nov 14 13:48:50 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.junit.runner.RunWith;
+import org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData;
 
 @RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
 public class URNDataESTest extends URNDataESTestscaffolding {
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNDataESTestscaffolding.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNDataESTestscaffolding.java
index 7ae4fabb38..cb0adccf12 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNDataESTestscaffolding.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNDataESTestscaffolding.java
@@ -4,7 +4,7 @@
  * Mon Nov 14 13:48:50 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
 import org.junit.BeforeClass;
@@ -25,7 +25,7 @@ public class URNDataESTestscaffolding {
 
   @BeforeClass 
   public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "com.att.camunda.bpm.plugin.urnmap.db.URNData"; 
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData"; 
     org.evosuite.runtime.GuiSupport.initialize(); 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
@@ -69,7 +69,7 @@ public class URNDataESTestscaffolding {
 
   private static void initializeClasses() {
     org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(URNDataESTestscaffolding.class.getClassLoader() ,
-      "com.att.camunda.bpm.plugin.urnmap.db.URNData"
+      "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData"
     );
   } 
 
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNServiceESTest.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNServiceESTest.java
index 9c71cdebf3..9838ff023d 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNServiceESTest.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNServiceESTest.java
@@ -3,15 +3,17 @@
  * Mon Nov 14 13:47:07 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.evosuite.runtime.EvoAssertions.*;
 
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.junit.runner.RunWith;
+import org.openecomp.camunda.bpmn.plugin.urnmap.db.URNService;
 
 @RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
 public class URNServiceESTest extends URNServiceESTestscaffolding {
@@ -28,7 +30,7 @@ public class URNServiceESTest extends URNServiceESTestscaffolding {
          //
          // no message in exception (getMessage() returned null)
          //
-         verifyException("com.att.camunda.bpm.plugin.urnmap.db.URNService", e);
+         verifyException("org.openecomp.camunda.bpmn.plugin.urnmap.db.URNService", e);
       }
   }
 }
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNServiceESTestscaffolding.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNServiceESTestscaffolding.java
index d6ce3f31b4..887e11acb6 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/db/URNServiceESTestscaffolding.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/URNServiceESTestscaffolding.java
@@ -4,7 +4,7 @@
  * Mon Nov 14 13:47:07 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.db;
+package org.openecomp.camunda.bpmn.plugin.urnmap.db;
 
 import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
 import org.junit.BeforeClass;
@@ -25,7 +25,7 @@ public class URNServiceESTestscaffolding {
 
   @BeforeClass 
   public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "com.att.camunda.bpm.plugin.urnmap.db.URNService"; 
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNService"; 
     org.evosuite.runtime.GuiSupport.initialize(); 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
@@ -70,7 +70,7 @@ public class URNServiceESTestscaffolding {
   private static void initializeClasses() {
     org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(URNServiceESTestscaffolding.class.getClassLoader() ,
       "org.camunda.bpm.engine.ProcessEngineException",
-      "com.att.camunda.bpm.plugin.urnmap.db.URNService",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNService",
       "org.camunda.bpm.engine.impl.interceptor.Command",
       "org.camunda.bpm.engine.ClassLoadingException",
       "org.camunda.bpm.engine.ProcessEngine",
@@ -81,7 +81,7 @@ public class URNServiceESTestscaffolding {
       "org.camunda.bpm.engine.impl.context.Context",
       "org.camunda.bpm.engine.impl.util.ReflectUtil",
       "org.camunda.bpm.engine.ProcessEngineServices",
-      "com.att.camunda.bpm.plugin.urnmap.db.URNData"
+      "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData"
     );
   } 
 
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/ProcessInstanceResourceESTest.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResourceESTest.java
index 56d7283026..8f45b8a0af 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/ProcessInstanceResourceESTest.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResourceESTest.java
@@ -3,17 +3,20 @@
  * Mon Nov 14 13:45:16 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.evosuite.runtime.EvoAssertions.*;
-import com.att.camunda.bpm.plugin.urnmap.db.URNData;
 
 import java.util.NoSuchElementException;
+
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.junit.runner.RunWith;
+import org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData;
+import org.openecomp.camunda.bpmn.plugin.urnmap.resources.ProcessInstanceResource;
 
 @RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
 public class ProcessInstanceResourceESTest extends ProcessInstanceResourceESTestscaffolding {
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/ProcessInstanceResourceESTestscaffolding.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResourceESTestscaffolding.java
index bb115f1586..27ae3e4dcd 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/ProcessInstanceResourceESTestscaffolding.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/ProcessInstanceResourceESTestscaffolding.java
@@ -4,7 +4,7 @@
  * Mon Nov 14 13:45:16 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
 import org.junit.BeforeClass;
@@ -25,7 +25,7 @@ public class ProcessInstanceResourceESTestscaffolding {
 
   @BeforeClass 
   public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "com.att.camunda.bpm.plugin.urnmap.resources.ProcessInstanceResource"; 
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.camunda.bpmn.plugin.urnmap.resources.ProcessInstanceResource"; 
     org.evosuite.runtime.GuiSupport.initialize(); 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
@@ -76,11 +76,11 @@ public class ProcessInstanceResourceESTestscaffolding {
       "org.camunda.bpm.cockpit.plugin.resource.AbstractPluginResource",
       "org.camunda.bpm.cockpit.db.QueryService",
       "org.camunda.bpm.engine.ProcessEngine",
-      "com.att.camunda.bpm.plugin.urnmap.resources.ProcessInstanceResource",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.resources.ProcessInstanceResource",
       "org.camunda.bpm.engine.ProcessEngineServices",
       "org.camunda.bpm.cockpit.db.CommandExecutor",
       "org.camunda.bpm.cockpit.Cockpit",
-      "com.att.camunda.bpm.plugin.urnmap.db.URNData"
+      "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData"
     );
   } 
 
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNMapPluginRootResourceESTest.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResourceESTest.java
index ba562f9bde..85a7f341f2 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNMapPluginRootResourceESTest.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResourceESTest.java
@@ -3,21 +3,25 @@
  * Mon Nov 14 13:48:27 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.evosuite.shaded.org.mockito.Mockito.*;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.UriInfo;
+
 import org.camunda.bpm.webapp.plugin.resource.AbstractAppPluginRootResource;
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.evosuite.runtime.ViolatedAssumptionAnswer;
 import org.evosuite.runtime.javaee.injection.Injector;
 import org.junit.runner.RunWith;
+import org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNMapPluginRootResource;
+import org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNResource;
 
 @RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
 public class URNMapPluginRootResourceESTest extends URNMapPluginRootResourceESTestscaffolding {
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNMapPluginRootResourceESTestscaffolding.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResourceESTestscaffolding.java
index 27070528cf..9b556d7006 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNMapPluginRootResourceESTestscaffolding.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNMapPluginRootResourceESTestscaffolding.java
@@ -4,7 +4,7 @@
  * Mon Nov 14 13:48:27 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
 import org.junit.BeforeClass;
@@ -25,7 +25,7 @@ public class URNMapPluginRootResourceESTestscaffolding {
 
   @BeforeClass 
   public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "com.att.camunda.bpm.plugin.urnmap.resources.URNMapPluginRootResource"; 
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNMapPluginRootResource"; 
     org.evosuite.runtime.GuiSupport.initialize(); 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
@@ -71,7 +71,7 @@ public class URNMapPluginRootResourceESTestscaffolding {
     org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(URNMapPluginRootResourceESTestscaffolding.class.getClassLoader() ,
       "org.camunda.bpm.webapp.plugin.resource.AbstractAppPluginResource",
       "org.camunda.bpm.webapp.plugin.spi.AppPlugin",
-      "com.att.camunda.bpm.plugin.urnmap.resources.URNResource",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNResource",
       "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
       "org.camunda.bpm.webapp.plugin.resource.AbstractAppPluginRootResource",
       "org.openecomp.mso.logger.MsoLogger$ErrorCode",
@@ -80,7 +80,7 @@ public class URNMapPluginRootResourceESTestscaffolding {
       "org.camunda.bpm.engine.rest.exception.RestException",
       "com.att.eelf.configuration.SLF4jWrapper",
       "com.att.eelf.i18n.EELFResourceManager",
-      "com.att.camunda.bpm.plugin.urnmap.db.URNData",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData",
       "org.openecomp.mso.logger.MsoLogger",
       "org.openecomp.mso.logger.MessageEnum",
       "com.att.eelf.i18n.EELFResolvableErrorEnum",
@@ -90,7 +90,7 @@ public class URNMapPluginRootResourceESTestscaffolding {
       "org.camunda.bpm.webapp.AppRuntimeDelegate",
       "org.openecomp.mso.logger.MsoLogger$StatusCode",
       "com.att.eelf.configuration.EELFManager",
-      "com.att.camunda.bpm.plugin.urnmap.resources.URNMapPluginRootResource",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNMapPluginRootResource",
       "com.att.eelf.i18n.EELFMsgs",
       "org.camunda.bpm.cockpit.plugin.resource.AbstractCockpitPluginRootResource",
       "com.att.eelf.configuration.EELFLogger$Level",
@@ -112,7 +112,7 @@ public class URNMapPluginRootResourceESTestscaffolding {
       "com.att.eelf.configuration.EELFLogger$Level",
       "com.att.eelf.configuration.EELFManager",
       "org.openecomp.mso.logger.MessageEnum",
-      "com.att.camunda.bpm.plugin.urnmap.resources.URNResource",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNResource",
       "org.camunda.bpm.webapp.plugin.resource.AbstractAppPluginRootResource"
     );
   }
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNResourceESTest.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResourceESTest.java
index 2c0a5eaf67..b6b5478130 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNResourceESTest.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResourceESTest.java
@@ -3,24 +3,27 @@
  * Mon Nov 14 13:47:41 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.evosuite.shaded.org.mockito.Mockito.*;
 import static org.evosuite.runtime.EvoAssertions.*;
-import com.att.camunda.bpm.plugin.urnmap.db.URNData;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.NoSuchElementException;
+
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.evosuite.runtime.PrivateAccess;
 import org.evosuite.runtime.ViolatedAssumptionAnswer;
 import org.junit.runner.RunWith;
+import org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData;
+import org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNResource;
 
 @RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
 public class URNResourceESTest extends URNResourceESTestscaffolding {
diff --git a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNResourceESTestscaffolding.java b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResourceESTestscaffolding.java
index 885426f3c8..61ef8e6c0b 100644
--- a/bpmn/MSOURN-plugin/src/test/java/com/att/camunda/bpm/plugin/urnmap/resources/URNResourceESTestscaffolding.java
+++ b/bpmn/MSOURN-plugin/src/test/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResourceESTestscaffolding.java
@@ -4,7 +4,7 @@
  * Mon Nov 14 13:47:41 GMT 2016
  */
 
-package com.att.camunda.bpm.plugin.urnmap.resources;
+package org.openecomp.camunda.bpmn.plugin.urnmap.resources;
 
 import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
 import org.junit.BeforeClass;
@@ -25,7 +25,7 @@ public class URNResourceESTestscaffolding {
 
   @BeforeClass 
   public static void initEvoSuiteFramework() { 
-    org.evosuite.runtime.RuntimeSettings.className = "com.att.camunda.bpm.plugin.urnmap.resources.URNResource"; 
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNResource"; 
     org.evosuite.runtime.GuiSupport.initialize(); 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100; 
     org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000; 
@@ -183,7 +183,7 @@ public class URNResourceESTestscaffolding {
       "org.h2.value.ValueDate",
       "org.h2.result.SearchRow",
       "org.h2.table.Table",
-      "com.att.camunda.bpm.plugin.urnmap.db.URNData",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.db.URNData",
       "org.h2.store.fs.FileMemData",
       "org.h2.value.ValueFloat",
       "org.openecomp.mso.entity.MsoRequest",
@@ -239,7 +239,7 @@ public class URNResourceESTestscaffolding {
       "org.h2.index.PageDelegateIndex",
       "org.h2.store.fs.FileBase",
       "com.mysql.jdbc.StatementImpl$CancelTask",
-      "com.att.camunda.bpm.plugin.urnmap.resources.URNResource",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNResource",
       "org.h2.message.TraceWriter",
       "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
       "com.att.eelf.configuration.EELFLogger",
@@ -337,7 +337,7 @@ public class URNResourceESTestscaffolding {
       "com.att.eelf.configuration.EELFLogger$Level",
       "com.att.eelf.configuration.EELFManager",
       "org.openecomp.mso.logger.MessageEnum",
-      "com.att.camunda.bpm.plugin.urnmap.resources.URNResource",
+      "org.openecomp.camunda.bpmn.plugin.urnmap.resources.URNResource",
       "org.camunda.bpm.cockpit.Cockpit",
       "org.h2.jdbcx.JdbcConnectionPool",
       "org.h2.message.TraceObject",