ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: # IGNITE-956: WIP. Added support for scala-2.10.
Date Tue, 02 Jun 2015 09:31:31 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-389-2 1adff387a -> 900e747a1


# IGNITE-956: WIP. Added support for scala-2.10.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/900e747a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/900e747a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/900e747a

Branch: refs/heads/ignite-389-2
Commit: 900e747a17a387b809158b80a7803b1fe6d3bc10
Parents: 1adff38
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Jun 2 16:31:22 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Jun 2 16:31:22 2015 +0700

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   6 +
 modules/scalar-2-10/README.txt                  |   4 -
 modules/scalar-2-10/pom.xml                     | 206 -------------------
 modules/scalar-2.10/README.txt                  |   4 +
 modules/scalar-2.10/pom.xml                     | 206 +++++++++++++++++++
 .../org/apache/ignite/spark/IgniteRDD.scala     |  25 ++-
 modules/visor-console-2.10/README.txt           |   4 +
 modules/visor-console-2.10/pom.xml              | 174 ++++++++++++++++
 pom.xml                                         |   7 +-
 9 files changed, 413 insertions(+), 223 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 1562dc4..8cc759c 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -3,9 +3,15 @@ Ignite Fabric Maven Build Instructions
 Without LGPL dependencies (default):
   mvn clean package -DskipTests
 
+Without LGPL dependencies and Scala 2.10:
+  mvn clean package -DskipTests -Dscala-2.10
+
 With LGPL dependencies:
   mvn clean package -DskipTests -Prelease,lgpl
 
+With LGPL dependencies and Scala 2.10:
+  mvn clean package -DskipTests -Prelease,lgpl -Dscala-2.10
+
 Look for incubator-ignite-<version>-bin.zip in ./target/bin directory.
 
 NOTE: JDK version should be 1.7.0-* or >= 1.8.0-u40.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/modules/scalar-2-10/README.txt
----------------------------------------------------------------------
diff --git a/modules/scalar-2-10/README.txt b/modules/scalar-2-10/README.txt
deleted file mode 100644
index 535a193..0000000
--- a/modules/scalar-2-10/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Apache Ignite Scalar Module
----------------------------
-
-Apache Ignite Scalar module to be build with Scala 2.10.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/modules/scalar-2-10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2-10/pom.xml b/modules/scalar-2-10/pom.xml
deleted file mode 100644
index 9b27dc7..0000000
--- a/modules/scalar-2-10/pom.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
--->
-
-<!--
-    POM file.
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.ignite</groupId>
-        <artifactId>ignite-parent</artifactId>
-        <version>1</version>
-        <relativePath>../../parent</relativePath>
-    </parent>
-
-    <artifactId>ignite-scalar_2.10</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>2.10.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-core</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-spring</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-indexing</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.10</artifactId>
-            <version>2.2.4</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.scala-lang</groupId>
-                    <artifactId>scala-library</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>../scalar/src/main/scala</directory>
-                <excludes>
-                    <exclude>**/*.scala</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>../scalar/src/test/scala</directory>
-                <excludes>
-                    <exclude>**/*.scala</exclude>
-                </excludes>
-            </testResource>
-        </testResources>
-
-        <plugins>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>scaladoc</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>doc</goal>
-                        </goals>
-                        <configuration>
-                            <doctitle>Ignite Scalar</doctitle>
-                            <windowtitle>Ignite Scalar</windowtitle>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.ignite</groupId>
-                        <artifactId>ignite-tools</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>scaladoc-postprocessing</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <target>
-                                <copy todir="target/site/scaladocs">
-                                    <fileset dir="../../assembly/docfiles">
-                                        <include name="img/**" />
-                                        <include name="*.js" />
-                                    </fileset>
-                                </copy>
-
-                                <taskdef name="doctask" classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask"
/>
-
-                                <doctask css="dotted" dir="target/site/scaladocs" verify="false">
-                                    <include name="**/*.html" />
-                                </doctask>
-
-                                <property name="footer">
-                                    <![CDATA[
-                                        <table style="padding: 0px 10px 10px 10px; width:
100%" border="0">
-                                        <tr>
-                                            <td>
-                                                <nobr>Ignite&#153; - Scalar DSL,
ver. <strong>${project.version}</strong></nobr>
-                                                <br>
-                                                <a target=_blank href="https://incubator.apache.org/projects/ignite.html"><nobr>2015
Copyright &#169; Apache Software Foundation</nobr></a>
-                                            </td>
-                                        </tr>
-                                        </table>
-                                    ]]>
-                                </property>
-
-                                <replace dir="target/site/scaladocs" token="&lt;!--FOOTER--&gt;"
value="${footer}">
-                                    <include name="**/*.html" />
-                                </replace>
-
-                                <replace dir="target/site/scaladocs">
-                                    <replacetoken>src="package.html"</replacetoken>
-                                    <replacevalue>src=org/apache/ignite/scalar/scalar$.html</replacevalue>
-                                    <include name="**/index.html" />
-                                </replace>
-
-                                <replace dir="target/site/scaladocs">
-                                    <replacetoken>location.replace("package.html")</replacetoken>
-                                    <replacevalue>location.replace("org/apache/ignite/scalar/scalar$.html")</replacevalue>
-                                    <include name="**/index.js" />
-                                </replace>
-
-                                <replace dir="target/site/scaladocs">
-                                    <replacetoken>docs.scala-lang.org/overviews/scaladoc/usage.html#members</replacetoken>
-                                    <replacevalue>docs.scala-lang.org/overviews/scaladoc/interface.html</replacevalue>
-                                    <fileset dir="target/site/scaladocs" />
-                                </replace>
-
-                                <replaceregexp byline="true" flags="im" encoding="UTF-8">
-                                    <regexp pattern="(&lt;dt&gt;Attributes&lt;/dt&gt;&lt;dd&gt;protected\[)&lt;a.+&gt;(.+)&lt;/a&gt;(\]\s+&lt;/dd&gt;)"
/>
-                                    <substitution expression="\1\2\3" />
-                                    <fileset dir="target/site/scaladocs" />
-                                </replaceregexp>
-
-                                <zip destfile="target/ignite-scalar-${project.version}-javadoc.jar"
basedir="target/site/scaladocs" encoding="UTF-8" />
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/modules/scalar-2.10/README.txt
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/README.txt b/modules/scalar-2.10/README.txt
new file mode 100644
index 0000000..535a193
--- /dev/null
+++ b/modules/scalar-2.10/README.txt
@@ -0,0 +1,4 @@
+Apache Ignite Scalar Module
+---------------------------
+
+Apache Ignite Scalar module to be build with Scala 2.10.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/modules/scalar-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar-2.10/pom.xml b/modules/scalar-2.10/pom.xml
new file mode 100644
index 0000000..6139c63
--- /dev/null
+++ b/modules/scalar-2.10/pom.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+
+<!--
+    POM file.
+-->
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite-parent</artifactId>
+        <version>1</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <artifactId>ignite-scalar_2.10</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>2.10.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-indexing</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_2.10</artifactId>
+            <version>2.2.2</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-library</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>../scalar/src/main/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>../scalar/src/test/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+
+        <plugins>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>scaladoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>doc</goal>
+                        </goals>
+                        <configuration>
+                            <doctitle>Ignite Scalar</doctitle>
+                            <windowtitle>Ignite Scalar</windowtitle>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.ignite</groupId>
+                        <artifactId>ignite-tools</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>scaladoc-postprocessing</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <target>
+                                <copy todir="target/site/scaladocs">
+                                    <fileset dir="../../assembly/docfiles">
+                                        <include name="img/**" />
+                                        <include name="*.js" />
+                                    </fileset>
+                                </copy>
+
+                                <taskdef name="doctask" classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask"
/>
+
+                                <doctask css="dotted" dir="target/site/scaladocs" verify="false">
+                                    <include name="**/*.html" />
+                                </doctask>
+
+                                <property name="footer">
+                                    <![CDATA[
+                                        <table style="padding: 0px 10px 10px 10px; width:
100%" border="0">
+                                        <tr>
+                                            <td>
+                                                <nobr>Ignite&#153; - Scalar DSL,
ver. <strong>${project.version}</strong></nobr>
+                                                <br>
+                                                <a target=_blank href="https://incubator.apache.org/projects/ignite.html"><nobr>2015
Copyright &#169; Apache Software Foundation</nobr></a>
+                                            </td>
+                                        </tr>
+                                        </table>
+                                    ]]>
+                                </property>
+
+                                <replace dir="target/site/scaladocs" token="&lt;!--FOOTER--&gt;"
value="${footer}">
+                                    <include name="**/*.html" />
+                                </replace>
+
+                                <replace dir="target/site/scaladocs">
+                                    <replacetoken>src="package.html"</replacetoken>
+                                    <replacevalue>src=org/apache/ignite/scalar/scalar$.html</replacevalue>
+                                    <include name="**/index.html" />
+                                </replace>
+
+                                <replace dir="target/site/scaladocs">
+                                    <replacetoken>location.replace("package.html")</replacetoken>
+                                    <replacevalue>location.replace("org/apache/ignite/scalar/scalar$.html")</replacevalue>
+                                    <include name="**/index.js" />
+                                </replace>
+
+                                <replace dir="target/site/scaladocs">
+                                    <replacetoken>docs.scala-lang.org/overviews/scaladoc/usage.html#members</replacetoken>
+                                    <replacevalue>docs.scala-lang.org/overviews/scaladoc/interface.html</replacevalue>
+                                    <fileset dir="target/site/scaladocs" />
+                                </replace>
+
+                                <replaceregexp byline="true" flags="im" encoding="UTF-8">
+                                    <regexp pattern="(&lt;dt&gt;Attributes&lt;/dt&gt;&lt;dd&gt;protected\[)&lt;a.+&gt;(.+)&lt;/a&gt;(\]\s+&lt;/dd&gt;)"
/>
+                                    <substitution expression="\1\2\3" />
+                                    <fileset dir="target/site/scaladocs" />
+                                </replaceregexp>
+
+                                <zip destfile="target/ignite-scalar-${project.version}-javadoc.jar"
basedir="target/site/scaladocs" encoding="UTF-8" />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
----------------------------------------------------------------------
diff --git a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
index f286b58..9a7c5f5 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteRDD.scala
@@ -51,17 +51,20 @@ class IgniteRDD[K, V] (
      * @return Partition iterator.
      */
     override def compute(part: Partition, context: TaskContext): Iterator[(K, V)] = {
-        val cache = ensureCache()
-
-        val qry: ScanQuery[K, V] = new ScanQuery[K, V](part.index)
-
-        val partNodes = ic.ignite().affinity(cache.getName).mapPartitionToPrimaryAndBackups(part.index)
-
-        val it: java.util.Iterator[Cache.Entry[K, V]] = cache.query(qry).iterator()
-
-        new IgniteQueryIterator[Cache.Entry[K, V], (K, V)](it, entry ⇒ {
-            (entry.getKey, entry.getValue)
-        })
+// TODO IGNITE-389 Fix compilation.
+//        val cache = ensureCache()
+//
+//        val qry: ScanQuery[K, V] = new ScanQuery[K, V](part.index)
+//
+//        val partNodes = ic.ignite().affinity(cache.getName).mapPartitionToPrimaryAndBackups(part.index)
+//
+//        val it: java.util.Iterator[Cache.Entry[K, V]] = cache.query(qry).iterator()
+//
+//        new IgniteQueryIterator[Cache.Entry[K, V], (K, V)](it, entry ⇒ {
+//            (entry.getKey, entry.getValue)
+//        })
+
+        null // TODO IGNITE-389 Fix compilation.
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/modules/visor-console-2.10/README.txt
----------------------------------------------------------------------
diff --git a/modules/visor-console-2.10/README.txt b/modules/visor-console-2.10/README.txt
new file mode 100644
index 0000000..1a018b9
--- /dev/null
+++ b/modules/visor-console-2.10/README.txt
@@ -0,0 +1,4 @@
+Apache Ignite Visor Console Module
+---------------------------
+
+Apache Ignite Visor Console module to be build with Scala 2.10.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/modules/visor-console-2.10/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console-2.10/pom.xml b/modules/visor-console-2.10/pom.xml
new file mode 100644
index 0000000..133dd56
--- /dev/null
+++ b/modules/visor-console-2.10/pom.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+
+<!--
+    POM file.
+-->
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite-parent</artifactId>
+        <version>1</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <artifactId>ignite-visor-console_2.10</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-ssh</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>2.10.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>jline</artifactId>
+            <version>2.10.4</version>
+        </dependency>
+        <!-- Third party dependencies -->
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-indexing</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_2.10</artifactId>
+            <version>2.2.2</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-library</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Test dependencies -->
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>../visor-console/src/main/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>../visor-console/src/test/scala</directory>
+                <excludes>
+                    <exclude>**/*.scala</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+
+        <plugins>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>scaladoc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>doc</goal>
+                        </goals>
+                        <configuration>
+                            <doctitle>Ignite Console Visor</doctitle>
+                            <windowtitle>Ignite Console Visor</windowtitle>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-antrun-plugin</artifactId>
+                 <version>1.7</version>
+                 <executions>
+                     <execution>
+                         <id>javadoc-zip</id>
+                         <goals>
+                             <goal>run</goal>
+                         </goals>
+                         <phase>prepare-package</phase>
+                         <configuration>
+                             <target>
+                                 <zip destfile="target/ignite-visor-console-${project.version}-javadoc.jar"
basedir="target/site/scaladocs" encoding="UTF-8" />
+                             </target>
+                         </configuration>
+                     </execution>
+                 </executions>
+             </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/900e747a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56fbff0..2e02866 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,7 +411,6 @@
 
             <activation>
                 <property><name>!scala-2.10</name></property>
-                <jdk>[1.7,)</jdk>
             </activation>
 
             <modules>
@@ -424,9 +423,13 @@
         <profile>
             <id>scala-2.10</id>
 
+            <activation>
+                <property><name>scala-2.10</name></property>
+            </activation>
+
             <modules>
                 <module>modules/scalar-2.10</module>
-                <module>modules/visor-console</module>
+                <module>modules/visor-console-2.10</module>
                 <module>modules/visor-plugins</module>
             </modules>
         </profile>


Mime
View raw message