9 files changed, 15 insertions, 16 deletions
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/src/main/docker/Dockerfile
index 957c87a8..22ced94a 100644
--- a/vnfmarket-be/deployment/docker/src/main/docker/Dockerfile
+++ b/vnfmarket-be/deployment/docker/src/main/docker/Dockerfile
@@ -40,9 +40,6 @@ ADD ./STAGE  /service
 
 # https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vnfsdk.refrepo.marketplace&a=vnf-sdk-marketplace-deployment&e=zip&c=&v=LATEST
 # RUN wget -q -O vnf-sdk-marketplace-1.0.0-SNAPSHOT.zip "https://nexus.onap.org/service/local/repositories/snapshots/content/org/onap/vnfsdk/refrepo/vnf-sdk-marketplace-deployment/1.0.0-SNAPSHOT/vnf-sdk-marketplace-deployment-1.0.0-20170515.020618-24.zip" && unzip -q -o -B vnf-sdk-marketplace-1.0.0-SNAPSHOT.zip && rm -f vnf-sdk-marketplace-1.0.0-SNAPSHOT.zip
-# Set permissions
-RUN find . -type d -exec chmod o-w {} \;
-RUN find . -name "*.sh" -exec chmod +x {} \;
 EXPOSE 8702
 # RUN echo ONAP vnf-sdk-marketplace 1.0.0-SNAPSHOT "https://nexus.onap.org/service/local/repositories/snapshots/content/org/openo/vnfsdk/refrepo/vnf-sdk-marketplace-deployment/1.0.0-SNAPSHOT/vnf-sdk-marketplace-deployment-1.0.0-20170515.020618-24.zip" > ONAP_VERSION
 
@@ -56,6 +53,11 @@ COPY instance-init.sh .
 COPY instance-run.sh .
 COPY instance-workaround.sh .
 COPY docker-entrypoint.sh .
+
+# Set permissions
+RUN find . -type d -exec chmod o-w {} \;
+RUN find . -name "*.sh" -exec chmod +x {} \;
+
 ENTRYPOINT /service/docker-entrypoint.sh
 
 COPY LICENSE ./ONAP_LICENSE
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/docker-entrypoint.sh b/vnfmarket-be/deployment/docker/src/main/docker/docker-entrypoint.sh
index a4527bb6..a4527bb6 100644..100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/docker-entrypoint.sh
+++ b/vnfmarket-be/deployment/docker/src/main/docker/docker-entrypoint.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/init-mysql.sh b/vnfmarket-be/deployment/docker/src/main/docker/init-mysql.sh
index 4b925cc0..4b925cc0 100644..100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/init-mysql.sh
+++ b/vnfmarket-be/deployment/docker/src/main/docker/init-mysql.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-config.sh b/vnfmarket-be/deployment/docker/src/main/docker/instance-config.sh
index 7a5327ac..7a5327ac 100644..100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-config.sh
+++ b/vnfmarket-be/deployment/docker/src/main/docker/instance-config.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-init.sh b/vnfmarket-be/deployment/docker/src/main/docker/instance-init.sh
index a7d5bb3d..a7d5bb3d 100644..100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-init.sh
+++ b/vnfmarket-be/deployment/docker/src/main/docker/instance-init.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-run.sh b/vnfmarket-be/deployment/docker/src/main/docker/instance-run.sh
index e2b0544b..e2b0544b 100644..100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-run.sh
+++ b/vnfmarket-be/deployment/docker/src/main/docker/instance-run.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-workaround.sh b/vnfmarket-be/deployment/docker/src/main/docker/instance-workaround.sh
index 40058f56..40058f56 100644..100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-workaround.sh
+++ b/vnfmarket-be/deployment/docker/src/main/docker/instance-workaround.sh
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapper.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapper.java
index f42ac636..5fa245f5 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapper.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapper.java
@@ -258,14 +258,14 @@ public class PackageWrapper {
                 
                 //Upload the Package to CATALOUGE and get CSARID
                 //---------------------------------------------
-                String catalougeCsarId = LifecycleTestExceutor.uploadPackageToCatalouge(oOnboradingRequest);
-                if((null == catalougeCsarId) || catalougeCsarId.isEmpty())
-                {
-                    LOG.error("Failed to Upload Package to catalougeCsarId " + ToolUtil.objectToString(basicInfo));
-                    return Response.status(Status.INTERNAL_SERVER_ERROR).build();
-                }
-                oOnboradingRequest.setCsarIdCatalouge(catalougeCsarId);
-                LOG.info("catalougeCsarId :" + catalougeCsarId);
+                //String catalougeCsarId = LifecycleTestExceutor.uploadPackageToCatalouge(oOnboradingRequest);
+                //if((null == catalougeCsarId) || catalougeCsarId.isEmpty())
+                //{
+                //    LOG.error("Failed to Upload Package to catalougeCsarId " + ToolUtil.objectToString(basicInfo));
+                    //return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+                // }
+                //oOnboradingRequest.setCsarIdCatalouge(catalougeCsarId);
+                //LOG.info("catalougeCsarId :" + catalougeCsarId);
 
                 
                 //Update Default download count to -1
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 c7480d0b..7aedd58b 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
@@ -3,10 +3,7 @@
    xmlns = "http://java.sun.com/xml/ns/javaee"  
    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee  
    http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"  
-   id = "WebApp_ID" version = "3.0"> 
-    <listener>
-        <listener-class>org.openo.vnfsdk.marketplace.msb.AppServletContextListener</listener-class>
-   </listener>
+   id = "WebApp_ID" version = "3.0">
    <servlet> 
       <servlet-name>Jersey RESTful Application</servlet-name> 
       <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> 
@@ -40,4 +37,4 @@
         <filter-name>CorsFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-</web-app>
-\ No newline at end of file
+</web-app>