Merge branch sprint-1 into ignite-9655-merge

.gitignore

@@ -19,3 +19,4 @@ atlassian-ide-plugin.xml
 target
 target/*
 /libs/
+pom-installed.xml

assembly/core-jar.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

assembly/dependencies-fabric.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -72,6 +72,10 @@
             <directory>modules/core/licenses</directory>
             <outputDirectory>/licenses</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>modules/core/target/libs</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>

assembly/dependencies-hadoop.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

assembly/dependencies-optional-fabric.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -46,6 +46,7 @@
                 <exclude>org.apache.ignite:ignite-visor-plugins</exclude>
                 <exclude>org.apache.ignite:ignite-visor-trial</exclude>
                 <exclude>org.apache.ignite:ignite-hadoop</exclude>
+                <exclude>org.apache.ignite:ignite-schema-load</exclude>
             </excludes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>

assembly/dependencies-optional-hadoop.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -47,7 +47,7 @@
                 <exclude>org.apache.ignite:ignite-hadoop</exclude>
                 <exclude>org.apache.ignite:ignite-visor-console</exclude>
                 <exclude>org.apache.ignite:ignite-visor-plugins</exclude>
-                <exclude>org.apache.ignite:ignite-visor-trial</exclude>
+                <exclude>org.apache.ignite:ignite-schema-load</exclude>
             </excludes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>

assembly/dependencies-visor-trial.xml → assembly/dependencies-schema-load.xml

@@ -15,13 +15,13 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
           http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>dependencies-visor-trial</id>
+    <id>dependencies-schema-load</id>
 
     <formats>
         <format>dir</format>
@@ -32,47 +32,23 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.apache.ignite:ignite-visor-trial</include>
+                <include>org.apache.ignite:ignite-schema-load</include>
             </includes>
-
             <sources>
                 <includeModuleDirectory>false</includeModuleDirectory>
                 <fileSets>
                     <fileSet>
-                        <directory>${basedir}</directory>
-                        <outputDirectory>/</outputDirectory>
+                        <directory>target</directory>
+                        <outputDirectory>/schema-load</outputDirectory>
                         <includes>
-                            <include>ggvisorui.*</include>
+                            <include>*.jar</include>
                         </includes>
-                    </fileSet>
-
-                    <fileSet>
-                        <directory>${basedir}licenses</directory>
-                        <outputDirectory>/include/visorui/licenses</outputDirectory>
-                        <includes>
-                            <include>*.txt</include>
-                        </includes>
-                    </fileSet>
-
-                    <fileSet>
-                        <directory>${basedir}/target/libs</directory>
-                        <outputDirectory>/include/visorui</outputDirectory>
                         <excludes>
-                            <exclude>ignite-spring-*.jar</exclude>
-                            <exclude>ignite-ssh-*.jar</exclude>
-                            <exclude>commons-logging-*.jar</exclude>
-                            <exclude>jsch-*.jar</exclude>
-                            <exclude>scala-library-*.jar</exclude>
-                            <exclude>spring-*.jar</exclude>
+                            <exclude>*-tests.jar</exclude>
+                            <exclude>*-javadoc.jar</exclude>
+                            <exclude>*-sources.jar</exclude>
                         </excludes>
                     </fileSet>
-                    <fileSet>
-                        <directory>${basedir}/licenses</directory>
-                        <outputDirectory>/include/visorui/licenses</outputDirectory>
-                        <includes>
-                            <include>**</include>
-                        </includes>
-                    </fileSet>
                 </fileSets>
             </sources>
         </moduleSet>

assembly/dependencies-visor-console.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

assembly/release-base.xml

@@ -15,7 +15,7 @@
   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.
-  -->
+-->
 
 <component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,6 +27,11 @@
             <outputDirectory>/</outputDirectory>
         </file>
 
+        <file>
+            <source>NOTICE.txt</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+
         <file>
             <source>config/ignite-log4j.xml</source>
             <outputDirectory>/config</outputDirectory>
@@ -57,6 +62,7 @@
                 <exclude>**/*hadoop*.bat</exclude>
                 <exclude>igniterouter.bat</exclude>
                 <exclude>**/target-classpath.bat</exclude>
+                <exclude>ignitevisorcmd.bat</exclude>
             </excludes>
         </fileSet>
 
@@ -72,11 +78,12 @@
                 <exclude>igniterouter.sh</exclude>
                 <exclude>**/target-classpath.sh</exclude>
                 <exclude>**/service.sh</exclude>
+                <exclude>ignitevisorcmd.sh</exclude>
             </excludes>
         </fileSet>
 
         <fileSet>
-            <directory>config/${gridgain.edition}</directory>
+            <directory>config/${ignite.edition}</directory>
             <outputDirectory>/config</outputDirectory>
         </fileSet>
 

assembly/release-fabric.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -31,10 +31,67 @@
 
     <componentDescriptors>
         <componentDescriptor>release-base.xml</componentDescriptor>
-        <componentDescriptor>release-base-fabric.xml</componentDescriptor>
     </componentDescriptors>
 
+    <files>
+        <file>
+            <source>examples/pom-standalone.xml</source>
+            <outputDirectory>/examples</outputDirectory>
+            <destName>pom.xml</destName>
+        </file>
+
+        <file>
+            <source>docs/ignite_readme.pdf</source>
+            <outputDirectory>/docs</outputDirectory>
+        </file>
+    </files>
+
     <fileSets>
+        <fileSet>
+            <directory>bin</directory>
+            <outputDirectory>/bin</outputDirectory>
+            <includes>
+                <include>igniterouter.bat</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>bin</directory>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>0755</fileMode>
+            <includes>
+                <include>igniterouter.sh</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>config/router</directory>
+            <outputDirectory>/config/router</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>examples</directory>
+            <outputDirectory>/examples</outputDirectory>
+            <includes>
+                <include>rest/**</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>target/javadoc/core</directory>
+            <outputDirectory>/docs/javadoc</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>modules/scalar/target/site/scaladocs</directory>
+            <outputDirectory>/docs/scaladoc/scalar</outputDirectory>
+        </fileSet>
+
+        <fileSet>
+            <directory>libs</directory>
+            <outputDirectory>/libs</outputDirectory>
+        </fileSet>
+
         <fileSet>
             <directory>examples</directory>
             <outputDirectory>/examples</outputDirectory>

assembly/release-hadoop.xml

@@ -15,7 +15,7 @@
   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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"