ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [23/45] incubator-ignite git commit: ignite-1258: added test jars used by some portable tests
Date Fri, 21 Aug 2015 06:48:41 GMT
ignite-1258: added test jars used by some portable tests


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

Branch: refs/heads/ignite-1258
Commit: c2ee4c43b6064a101770929d4da11b74d3f439b6
Parents: 8c998da
Author: Denis Magda <dmagda@gridgain.com>
Authored: Wed Aug 19 14:01:26 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Wed Aug 19 14:01:26 2015 +0300

----------------------------------------------------------------------
 modules/core/pom.xml                            |  21 +++++++++++++++++++
 .../portable/GridPortableWildcardsSelfTest.java |  14 ++++++-------
 .../ignite/portable/test1/1.1/test1-1.1.jar     | Bin 0 -> 2548 bytes
 .../ignite/portable/test1/1.1/test1-1.1.pom     |   9 ++++++++
 .../portable/test1/maven-metadata-local.xml     |  12 +++++++++++
 .../ignite/portable/test2/1.1/test2-1.1.jar     | Bin 0 -> 1361 bytes
 .../ignite/portable/test2/1.1/test2-1.1.pom     |   9 ++++++++
 .../portable/test2/maven-metadata-local.xml     |  12 +++++++++++
 parent/pom.xml                                  |   4 ++++
 9 files changed, 74 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index c8abe15..6f1cbf8 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -33,6 +33,13 @@
     <artifactId>ignite-core</artifactId>
     <version>1.4.1-SNAPSHOT</version>
 
+    <repositories>
+        <repository>
+            <id>ignite-portables-test-repo</id>
+            <url>file://${basedir}/src/test/portables/repo</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>javax.cache</groupId>
@@ -164,6 +171,20 @@
             <version>2.4</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite.portable</groupId>
+            <artifactId>test1</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ignite.portable</groupId>
+            <artifactId>test2</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
index 76b9709..36beb3f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
@@ -283,7 +283,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest
{
         PortableMarshaller marsh = portableMarshaller();
 
         marsh.setClassNames(Arrays.asList(
-            "org.gridgain.grid.util.portable.testjar.*",
+            "org.apache.ignite.portable.testjar.*",
             "unknown.*"
         ));
 
@@ -322,7 +322,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest
{
         });
 
         marsh.setClassNames(Arrays.asList(
-            "org.gridgain.grid.util.portable.testjar.*",
+            "org.apache.ignite.portable.testjar.*",
             "unknown.*"
         ));
 
@@ -345,7 +345,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest
{
         PortableMarshaller marsh = portableMarshaller();
 
         marsh.setTypeConfigurations(Arrays.asList(
-            new PortableTypeConfiguration("org.gridgain.grid.util.portable.testjar.*"),
+            new PortableTypeConfiguration("org.apache.ignite.portable.testjar.*"),
             new PortableTypeConfiguration("unknown.*")
         ));
 
@@ -384,7 +384,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest
{
         });
 
         marsh.setTypeConfigurations(Arrays.asList(
-            new PortableTypeConfiguration("org.gridgain.grid.util.portable.testjar.*"),
+            new PortableTypeConfiguration("org.apache.ignite.portable.testjar.*"),
             new PortableTypeConfiguration("unknown.*")
         ));
 
@@ -423,7 +423,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest
{
         });
 
         marsh.setTypeConfigurations(Arrays.asList(
-            new PortableTypeConfiguration("org.gridgain.grid.util.portable.testjar.*"),
+            new PortableTypeConfiguration("org.apache.ignite.portable.testjar.*"),
             new PortableTypeConfiguration("unknown.*")
         ));
 
@@ -446,11 +446,11 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest
{
         PortableMarshaller marsh = portableMarshaller();
 
         marsh.setClassNames(Arrays.asList(
-            "org.gridgain.grid.util.portable.testjar.*"
+            "org.apache.ignite.portable.testjar.*"
         ));
 
         PortableTypeConfiguration typeCfg = new PortableTypeConfiguration(
-            "org.gridgain.grid.util.portable.testjar.GridPortableTestClass2");
+            "org.apache.ignite.portable.testjar.GridPortableTestClass2");
 
         typeCfg.setIdMapper(new PortableIdMapper() {
             @Override public int typeId(String clsName) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar
b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar
new file mode 100644
index 0000000..863350d
Binary files /dev/null and b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar
differ

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.pom
b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.pom
new file mode 100644
index 0000000..c79dfbf
--- /dev/null
+++ b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ignite.portable</groupId>
+  <artifactId>test1</artifactId>
+  <version>1.1</version>
+  <description>POM was created from install:install-file</description>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/maven-metadata-local.xml
b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/maven-metadata-local.xml
new file mode 100644
index 0000000..33f5abf
--- /dev/null
+++ b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test1/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.ignite.portable</groupId>
+  <artifactId>test1</artifactId>
+  <versioning>
+    <release>1.1</release>
+    <versions>
+      <version>1.1</version>
+    </versions>
+    <lastUpdated>20140806090184</lastUpdated>
+  </versioning>
+</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar
b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar
new file mode 100644
index 0000000..ccf4ea2
Binary files /dev/null and b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar
differ

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.pom
b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.pom
new file mode 100644
index 0000000..37621e1
--- /dev/null
+++ b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ignite.portable</groupId>
+  <artifactId>test2</artifactId>
+  <version>1.1</version>
+  <description>POM was created from install:install-file</description>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/maven-metadata-local.xml
b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/maven-metadata-local.xml
new file mode 100644
index 0000000..9c705ef
--- /dev/null
+++ b/modules/core/src/test/portables/repo/org/apache/ignite/portable/test2/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.ignite.portable</groupId>
+  <artifactId>test2</artifactId>
+  <versioning>
+    <release>1.1</release>
+    <versions>
+      <version>1.1</version>
+    </versions>
+    <lastUpdated>20140806090410</lastUpdated>
+  </versioning>
+</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2ee4c43/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index efa6494..9997443 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -703,6 +703,10 @@
                                         <exclude>dev-tools/.gradle/**/*</exclude>
                                         <exclude>dev-tools/gradle/wrapper/**/*</exclude>
                                         <exclude>dev-tools/gradlew</exclude>
+                                        <exclude>src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.pom</exclude>
+                                        <exclude>src/test/portables/repo/org/apache/ignite/portable/test2/maven-metadata-local.xml</exclude>
+                                        <exclude>src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.pom</exclude>
+                                        <exclude>src/test/portables/repo/org/apache/ignite/portable/test1/maven-metadata-local.xml</exclude>
                                         <!--shmem-->
                                         <exclude>ipc/shmem/**/Makefile.in</exclude><!--auto
generated files-->
                                         <exclude>ipc/shmem/**/Makefile</exclude><!--auto
generated files-->


Mime
View raw message