fixes in distributive

dsukhoroslov · Feb 1, 2017 · 7716b72 · 7716b72
1 parent 27e7f55
commit 7716b72
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/bagri-distr/src/main/assembly/common.xml b/bagri-distr/src/main/assembly/common.xml
@@ -25,9 +25,9 @@
 	    <useAllReactorProjects>true</useAllReactorProjects>
 	    <!--includeSubModules>true</includeSubModules-->
 	    <includes>
-            	<include>com.bagri.db:bagri-samples-client</include>
-            	<include>com.bagri.db:bagri-samples-embedded</include>
-            	<include>com.bagri.db:bagri-samples-ext</include>
+            	<include>com.bagridb:bagri-samples-client</include>
+            	<include>com.bagridb:bagri-samples-embedded</include>
+            	<include>com.bagridb:bagri-samples-ext</include>
 	    </includes>
 	    <sources>
 		<outputDirectoryMapping>samples/${module.basedir.name}</outputDirectoryMapping>
@@ -46,13 +46,13 @@
         <!--moduleSet>
 	    <useAllReactorProjects>true</useAllReactorProjects>
 	    <includes>
-            	<include>com.bagri.db:bagri-tools-vvmp:*</include>
+            	<include>com.bagridb:bagri-tools-vvmp:*</include>
 	    </includes>
 	    <binaries>
 		<outputDirectory>distr</outputDirectory>
 		<includeDependencies>false</includeDependencies>
        		<includes>
-               	    <include>com.bagri.db:bagri-tools-vvmp:nbm:*</include>
+               	    <include>com.bagridb:bagri-tools-vvmp:nbm:*</include>
             	</includes>
 		<unpack>false</unpack>
       	    </binaries>
@@ -131,6 +131,18 @@
         <fileSet>
             <directory>src/main/docs</directory>
             <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.txt</include>
+            </includes>
+        </fileSet>
+
+        <!-- I&C Guide-->
+        <fileSet>
+            <directory>src/main/docs</directory>
+            <outputDirectory>/docs</outputDirectory>
+            <includes>
+                <include>*.pdf</include>
+            </includes>
         </fileSet>
 
         <!--all the dependent modules javadocs generated-->

diff --git a/bagri-distr/src/main/assembly/xqj-driver.xml b/bagri-distr/src/main/assembly/xqj-driver.xml
@@ -11,20 +11,20 @@
         <moduleSet>
 	    <useAllReactorProjects>true</useAllReactorProjects>
 	    <excludes> 
-            	<exclude>com.bagri.db:bagri-distr</exclude>
-            	<exclude>com.bagri.db:bagri-rest</exclude>
-            	<exclude>com.bagri.db:bagri-samples-*</exclude>
-            	<exclude>com.bagri.db:bagri-server-*</exclude>
-            	<exclude>com.bagri.db:bagri-test-*</exclude>
-            	<exclude>com.bagri.db:bagri-tools-*</exclude>
+            	<exclude>com.bagridb:bagri-distr</exclude>
+            	<exclude>com.bagridb:bagri-rest</exclude>
+            	<exclude>com.bagridb:bagri-samples-*</exclude>
+            	<exclude>com.bagridb:bagri-server-*</exclude>
+            	<exclude>com.bagridb:bagri-test-*</exclude>
+            	<exclude>com.bagridb:bagri-tools-*</exclude>
 	    </excludes>
 	    <binaries>
         	<outputDirectory>/</outputDirectory>
 	    	<includes>
-		    <include>com.bagri.db:bagri-core</include>
-            	    <include>com.bagri.db:bagri-xqj</include>
-            	    <include>com.bagri.db:bagri-xquery-saxon</include>
-            	    <include>com.bagri.db:bagri-client-hazelcast</include>
+		    <include>com.bagridb:bagri-core</include>
+            	    <include>com.bagridb:bagri-xqj</include>
+            	    <include>com.bagridb:bagri-xquery-saxon</include>
+            	    <include>com.bagridb:bagri-client-hazelcast</include>
             	    <!-- third-party modules -->
             	    <include>com.hazelcast:hazelcast-all</include>
             	    <include>org.slf4j:slf4j-api</include>

diff --git a/bagri-distr/src/main/docs/Installation and Configuration Guide 1.1.pdf b/bagri-distr/src/main/docs/Installation and Configuration Guide 1.1.pdf
diff --git a/bagri-distr/src/main/resources/test/config.xml b/bagri-distr/src/main/resources/test/config.xml
@@ -679,7 +679,7 @@
             <version>1</version>
             <createdAt>2016-05-31T16:17:20.542+03:00</createdAt>
             <createdBy>admin</createdBy>
-            <fileName>../samples/bagri-samples-ext/target/bagri-samples-ext-1.1.0.jar</fileName>
+            <fileName>../samples/bagri-samples-ext/target/bagri-samples-ext-1.2.0-SNAPSHOT.jar</fileName>
             <description>Sample extension trigger Library</description>
             <enabled>true</enabled>
             <functions/>