change 2 github

justeene · Dec 21, 2017 · f24a2a7 · f24a2a7
1 parent 8b4675a
commit f24a2a7
Show file tree

Hide file tree

Showing 365 changed files with 26,607 additions and 8,997 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ spark-warehouse
 *.bak
 *.log
 *.conf
-swagger-ui
-davinci-ui
-lib
+swagger-ui/
+davinci-ui/
+lib/
+tempFiles/
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -99,5 +99,38 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>test</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>edp.davinci.util.ESTest</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
@@ -20,6 +20,8 @@
 
 
 
+
+
 <assembly>
     <id>dist</id>
     <formats>
@@ -51,12 +53,24 @@
             </directory>
             <outputDirectory>bin</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/tempFiles
+            </directory>
+            <outputDirectory>tempFiles</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>
                 ${project.parent.basedir}/davinci-ui
             </directory>
             <outputDirectory>davinci-ui</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/swagger-ui
+            </directory>
+            <outputDirectory>swagger-ui</outputDirectory>
+        </fileSet>
 
     </fileSets>
 

diff --git a/assembly/src/main/assembly/release.xml b/assembly/src/main/assembly/release.xml
@@ -0,0 +1,88 @@
+<!--
+  <<
+  Davinci
+  ==
+  Copyright (C) 2016 - 2017 EDP
+  ==
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  >>
+  -->
+
+
+
+
+
+
+<assembly>
+    <id>release</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.parent.basedir}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/conf
+            </directory>
+            <outputDirectory>conf</outputDirectory>
+            <includes>
+                <include>application.conf.example</include>
+                <include>log4j.properties</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/bin
+            </directory>
+            <outputDirectory>bin</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/tempFiles
+            </directory>
+            <outputDirectory>tempFiles</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/davinci-ui
+            </directory>
+            <outputDirectory>davinci-ui</outputDirectory>
+        </fileSet>
+
+    </fileSets>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+        </dependencySet>
+    </dependencySets>
+
+    <!--<files>
+        <file>
+            <source>${project.parent.basedir}/server/target/davinci-server_2.11-${project.parent.version}-jar-with-dependencies.jar</source>
+            <outputDirectory>plugin</outputDirectory>
+        </file>
+    </files>-->
+</assembly>
diff --git a/bin/build.sh b/bin/build.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+current_dir=`pwd`
+script_dir=$(cd `dirname $0`; pwd)
+echo $script_dir
+echo $current_dir
+cd $script_dir
+cd ..
+cd $current_dir