From d8c03aac3e5ac6a495cb0b2ca664076b3f55dfb8 Mon Sep 17 00:00:00 2001
From: Murali <murali.p@huawei.com>
Date: Thu, 31 Aug 2017 11:08:10 +0000
Subject: Fix class path issue

Change-Id: I9b6eddced269b888e84d2dc23257223b6d2545ce
Jira:VNFSDK-71
Signed-off-by: Murali <murali.p@huawei.com>
---
 .../src/main/resources/mybatis/sql/MarketplaceMapper.xml     | 12 ++++++------
 .../vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml      |  2 +-
 .../vnfsdk/marketplace/resource/PackageResourceTest.java     |  9 +--------
 3 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'vnfmarket-be')

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/sql/MarketplaceMapper.xml b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/sql/MarketplaceMapper.xml
index 27801ae5..aeaa4a47 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/sql/MarketplaceMapper.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/resources/mybatis/sql/MarketplaceMapper.xml
@@ -15,16 +15,16 @@
   limitations under the License.
 -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.openo.vnfsdk.marketplace.db.mapper.IMarketplaceMapper">
+<mapper namespace="org.onap.vnfsdk.marketplace.db.mapper.IMarketplaceMapper">
 
-    <select id="getAllPackageData" resultType="org.openo.vnfsdk.marketplace.db.entity.PackageData">
+    <select id="getAllPackageData" resultType="org.onap.vnfsdk.marketplace.db.entity.PackageData">
         SELECT 
         *
         FROM
         CSAR_PACKAGE_TABLE
     </select>
 	
-	<select id="getPackageData" resultType="org.openo.vnfsdk.marketplace.db.entity.PackageData">
+	<select id="getPackageData" resultType="org.onap.vnfsdk.marketplace.db.entity.PackageData">
 	SELECT 
 	*
 	FROM
@@ -33,7 +33,7 @@
 	CSARID=#{csarId}
     </select>
 	
-	<insert id="savePackageData" parameterType="org.openo.vnfsdk.marketplace.db.entity.PackageData">
+	<insert id="savePackageData" parameterType="org.onap.vnfsdk.marketplace.db.entity.PackageData">
         INSERT INTO
         CSAR_PACKAGE_TABLE
         (CSARID, DOWNLOADURI, REPORT, SIZE, FORMAT, CREATETIME, DELETIONPENDING, MODIFYTIME, SHORTDESC, NAME, VERSION, PROVIDER, TYPE, DETAILS, REMARKS,DOWNLOADCOUNT)
@@ -48,10 +48,10 @@
         CSARID=#{csarId}
     </delete>
 	
-	<delete id="updatePackageData" parameterType="org.openo.vnfsdk.marketplace.db.entity.PackageData">
+	<delete id="updatePackageData" parameterType="org.onap.vnfsdk.marketplace.db.entity.PackageData">
         UPDATE CSAR_PACKAGE_TABLE SET  DOWNLOADCOUNT=#{downloadCount}
         WHERE
         CSARID=#{csarId}
     </delete>
 	
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml b/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml
index 7aedd58b..21497057 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/webapp/WEB-INF/web.xml
@@ -9,7 +9,7 @@
       <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> 
       <init-param> 
          <param-name>jersey.config.server.provider.packages</param-name> 
-         <param-value>org.openo.vnfsdk.marketplace.resource</param-value> 
+         <param-value>org.onap.vnfsdk.marketplace.resource</param-value> 
       </init-param> 
       <init-param>
           <param-name>jersey.config.server.provider.classnames</param-name>
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
index bccbfaba..13dcf2f6 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
@@ -995,14 +995,7 @@ public class PackageResourceTest {
         assertEquals(res,true);
     }
 
-    @Test
-    public void testGetSession() {
-        try {
-            assertNull( ConnectionUtil.getSession() );
-        } catch( Exception e ) {
-            e.printStackTrace();
-        }
-    }
+  
 
     @Test
     public void testToJson() {
-- 
cgit 1.2.3-korg