ONAP normative fixes

Change-Id: I56d55c8591beefbd984f99bbc099579ad1ef6303
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index f4a2c30..5b13e02 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -610,41 +610,6 @@
                                </configuration>
                        </plugin>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <includeScope>compile</includeScope>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-installed</id>
-                                               <phase>install</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>${project.groupId}</groupId>
-                                                                       <artifactId>${project.artifactId}</artifactId>
-                                                                       <version>${project.version}</version>
-                                                                       <type>${project.packaging}</type>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                                       <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
                        <plugin>
                                <groupId>com.jcabi</groupId>
                                <artifactId>jcabi-maven-plugin</artifactId>
@@ -662,25 +627,6 @@
                                <artifactId>maven-resources-plugin</artifactId>
                                <version>2.6</version>
                                <executions>
-                                       <execution>
-                                               <id>copy-normatives</id>
-                                               <phase>install</phase>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>./target</directory>
-                                                                       <includes>
-                                                                               <include>normatives.tar.gz</include>
-                                                                       </includes>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       
                                <execution>
                                <id>copy-tosca-folder</id>
                                <!-- here the phase you need -->

diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 757e543..d79d6aa 100644 (file)
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -323,42 +323,7 @@
                                        </webResources>
                                </configuration>
                        </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <includeScope>compile</includeScope>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-installed</id>
-                                               <phase>install</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>${project.groupId}</groupId>
-                                                                       <artifactId>${project.artifactId}</artifactId>
-                                                                       <version>${project.version}</version>
-                                                                       <type>${project.packaging}</type>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                                       <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-frontend/</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
+                       
                        <plugin>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-maven-plugin</artifactId>

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 3ad8a4b..a4c8036 100644 (file)
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -4,6 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sdc-os-chef</artifactId>
+    <packaging>pom</packaging>
+    
 
     <parent>
         <groupId>org.openecomp.sdc</groupId>
@@ -32,24 +34,47 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>
-                                        ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\
-                                    </directory>
+                                    <directory>${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\</directory>
                                     <followSymlinks>false</followSymlinks>
                                     <includes>
                                         <include>**/default.rb</include>
                                     </includes>
                                 </fileset>
-                                                               <!-- static configuration files -->
-                                                               <fileset>       
-                                                               <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory>
-                                                               <includes>
+                                <!-- static configuration files -->
+                                       <fileset>       
+                                               <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</directory>
+                                               <followSymlinks>false</followSymlinks>
+                                       <includes>
                                                                                <include>Artifact-Generator.properties</include>
                                                                                <include>error-configuration.yaml</include>
                                                                                <include>ecomp-error-configuration.yaml</include>
                                                                                <include>logback.xml</include>
                                                                        </includes>
                                                        </fileset>
+                                <!-- BE WAR's -->
+                                <fileset>      
+                                       <directory>${project.parent.basedir}/sdc-os-chef/sdc-backend</directory>
+                                       <followSymlinks>false</followSymlinks>
+                                    <includes>
+                                       <include>*.war</include>
+                                       </includes>
+                                       </fileset>
+                                       <!-- FE WAR's -->
+                                <fileset>      
+                                       <directory>${project.parent.basedir}/sdc-os-chef/sdc-frontend/</directory>
+                                       <followSymlinks>false</followSymlinks>
+                                    <includes>
+                                       <include>*.war</include>
+                                       </includes>
+                                       </fileset>
+                                       <fileset>
+                                    <directory>${project.basedir}/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</directory>
+                                                                       <followSymlinks>false</followSymlinks>
+                                    <includes>
+                                       <include>normatives.tar.gz</include>
+                                       </includes>
+                                </fileset>
+                                
                             </filesets>
                         </configuration>
                     </execution>
@@ -157,6 +182,12 @@
                                 <configuration>
                                     <outputDirectory>${basedir}/sdc-backend</outputDirectory>
                                     <resources>
+                                       <resource>
+                                            <directory>${project.parent.basedir}/catalog-be/target</directory>
+                                            <includes>
+                                                <include>catalog-be-${project.version}.war</include>
+                                            </includes>
+                                        </resource>
                                         <resource>
                                             <directory>
                                                 ${project.parent.basedir}/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target
@@ -168,6 +199,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-resources-fe</id>
                                 <phase>validate</phase>
@@ -177,6 +209,12 @@
                                 <configuration>
                                     <outputDirectory>${basedir}/sdc-frontend</outputDirectory>
                                     <resources>
+                                       <resource>
+                                               <directory>${project.parent.basedir}/catalog-fe/target</directory>
+                                            <includes>
+                                                       <include>catalog-fe-${project.version}.war</include>
+                                            </includes>
+                                        </resource>
                                         <resource>
                                             <directory>${project.parent.basedir}/openecomp-ui/target</directory>
                                             <includes>
@@ -186,6 +224,7 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>copy-tests-suites</id>
                                 <phase>validate</phase>
@@ -222,6 +261,24 @@
                                     </resources>
                                 </configuration>
                             </execution>
+                            <execution>
+                                                               <id>copy-normatives</id>
+                                                               <phase>validate</phase>
+                                                               <goals>
+                                                                       <goal>copy-resources</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
+                                                                       <resources>
+                                                                               <resource>
+                                                                                       <directory>${project.parent.basedir}/catalog-be/target</directory>
+                                                                                       <includes>
+                                                                                               <include>normatives.tar.gz</include>
+                                                                                       </includes>
+                                                                               </resource>
+                                                                       </resources>
+                                                               </configuration>
+                                                       </execution>
                         </executions>
                     </plugin>
 

diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index 9052e74..dd38726 100644 (file)
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -4,8 +4,6 @@ COPY chef-solo /root/chef-solo/
 
 COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
 
-#RUN python /root/chef-solo/cookbooks/sdc-normatives/files/default/get-pip.py
-
 ADD onboarding-be-*.war        ${JETTY_BASE}/webapps/
 
 ADD catalog-be-*.war           ${JETTY_BASE}/webapps/