From: fengyuanxing <feng.yuanxing@zte.com.cn>
Date: Thu, 9 Feb 2017 03:08:40 +0000 (+0800)
Subject: modify pom and assembly files
X-Git-Tag: release/mercury~7
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ff65662977a37ac9642096b8ee8cffe3917cdd5d;p=vfc%2Fgvnfm%2Fvnfmgr.git

modify pom and assembly files

Change-Id: I236db45e12149743f4946ece6ddacbbe079c9a21
Issue-Id: GVNFM-29
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
---

diff --git a/mgr/assembly.xml b/mgr/assembly.xml
index 08fffa0..788e995 100644
--- a/mgr/assembly.xml
+++ b/mgr/assembly.xml
@@ -16,14 +16,14 @@
 <assembly 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>lcm</id>
+    <id>mgr</id>
     <formats>
         <format>zip</format>
     </formats>
     <fileSets>
         <fileSet>
-            <directory>lcm</directory>
-            <outputDirectory>/lcm</outputDirectory>
+            <directory>mgr</directory>
+            <outputDirectory>/mgr</outputDirectory>
             <includes>
                 <include>**/*.py</include>
             </includes>
@@ -47,5 +47,5 @@
             </includes>
         </fileSet>
     </fileSets>
-    <baseDirectory>gvnfm/lcm</baseDirectory>
+    <baseDirectory>gvnfm-vnfmgr/mgr</baseDirectory>
 </assembly>
diff --git a/mgr/pom.xml b/mgr/pom.xml
index ebfbabe..498d0ba 100644
--- a/mgr/pom.xml
+++ b/mgr/pom.xml
@@ -16,17 +16,18 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.openo.gvnfm</groupId>
-        <artifactId>nfvo-root</artifactId>
+        <groupId>org.openo.oparent</groupId>
+        <artifactId>oparent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../oparent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openo.gvnfm</groupId>
-    <artifactId>gvnfm-lcm</artifactId>
+    <groupId>org.openo.gvnfm.vnfmgr</groupId>
+    <artifactId>gvnfm-vnfmgr</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>gvnfm-vnfmgr/mgr</name>
-    <description>gvnfm lcm</description>
+    <description>gvnfm vnfmgr</description>
     <build>
       <plugins>
         <plugin>