ignite-1060
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a0ccb5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a0ccb5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a0ccb5d Branch: refs/heads/ignite-950 Commit: 3a0ccb5dd1ba0969cb13d8c8bad1d99a43144f03 Parents: 5dff89c Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Jun 29 17:08:13 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Jun 29 17:08:13 2015 +0300 ---------------------------------------------------------------------- modules/core/src/test/config/tests.properties | 6 +++--- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- .../java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0ccb5d/modules/core/src/test/config/tests.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/tests.properties b/modules/core/src/test/config/tests.properties index a9c6b77..ce6d4d8 100644 --- a/modules/core/src/test/config/tests.properties +++ b/modules/core/src/test/config/tests.properties @@ -65,9 +65,9 @@ ant.gar.tmpdir=${java.io.tmpdir}/gg ant.gar.srcdir=@{IGNITE_HOME}/modules/extdata/uri/target/classes/ # GAR paths to use in URI deployment SPI tests -ant.urideployment.gar.uri=file://freq=5000@localhost/EXTDATA/uri/deploy -ant.urideployment.gar.file=modules/extdata/uri/deploy/uri.gar -ant.urideployment.gar.path=modules/extdata/uri/deploy/ +ant.urideployment.gar.uri=file://freq=5000@localhost/EXTDATA/uri/target/deploy +ant.urideployment.gar.file=modules/extdata/uri/target/deploy/uri.gar +ant.urideployment.gar.path=modules/extdata/uri/target/deploy/ # Classpath directory for GridP2PUserVersionChangeSelfTest ant.userversion.class.dir=@{IGNITE_HOME}/modules/tests/java/ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0ccb5d/modules/extdata/p2p/pom.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml index 26f2e50..cffa10b 100644 --- a/modules/extdata/p2p/pom.xml +++ b/modules/extdata/p2p/pom.xml @@ -85,7 +85,7 @@ <target> <taskdef name="gar" classname="org.apache.ignite.util.antgar.IgniteDeploymentGarAntTask" /> - <gar destfile="${basedir}/deploy/p2p.gar" descrdir="${basedir}/META-INF" basedir="${basedir}/target/classes" /> + <gar destfile="${basedir}/target/deploy/p2p.gar" descrdir="${basedir}/META-INF" basedir="${basedir}/target/classes" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0ccb5d/modules/extdata/uri/pom.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml index 1690ab9..3d43040 100644 --- a/modules/extdata/uri/pom.xml +++ b/modules/extdata/uri/pom.xml @@ -114,7 +114,7 @@ <taskdef name="gar" classname="org.apache.ignite.util.antgar.IgniteDeploymentGarAntTask" /> - <gar destfile="${basedir}/deploy/uri.gar" basedir="${basedir}/target/classes" /> + <gar destfile="${basedir}/target/deploy/uri.gar" basedir="${basedir}/target/classes" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a0ccb5d/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java index d2d6187..5b2c9b1 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java @@ -121,7 +121,7 @@ public class GridP2PDisabledSelfTest extends GridCommonAbstractTest { private void checkGar() throws Exception { initGar = true; - String garDir = "modules/extdata/p2p/deploy"; + String garDir = "modules/extdata/p2p/target/deploy"; String garFileName = "p2p.gar"; File origGarPath = U.resolveIgnitePath(garDir + '/' + garFileName);
