fixed GridUriDeploymentClassLoaderSelfTest#testNestedJarClassloading Signed-off-by: Anton Vinogradov <a...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea63c2dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea63c2dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea63c2dc Branch: refs/heads/ignite-1607 Commit: ea63c2dc5e326c98b5091c9bf04d348efb92e8fe Parents: bd2cd92 Author: ashutak <ashu...@gridgain.com> Authored: Mon Oct 19 20:30:55 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Oct 26 18:03:46 2015 +0300 ---------------------------------------------------------------------- modules/core/src/test/config/tests.properties | 4 ++-- modules/extdata/uri/pom.xml | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ea63c2dc/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 49e616e..3275c3c 100644 --- a/modules/core/src/test/config/tests.properties +++ b/modules/core/src/test/config/tests.properties @@ -67,8 +67,8 @@ 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/target/deploy ant.urideployment.gar.file=modules/extdata/uri/target/deploy/uri.gar -ant.urideployment.gar.libs-file=modules/extdata/uri/target/deploy/uri-libs.gar -ant.urideployment.gar.classes-file=modules/extdata/uri/target/deploy/uri-classes.gar +ant.urideployment.gar.libs-file=modules/extdata/uri/target/deploy2/uri-libs.gar +ant.urideployment.gar.classes-file=modules/extdata/uri/target/deploy2/uri-classes.gar ant.urideployment.gar.path=modules/extdata/uri/target/deploy/ ant.urideployment.gar.path.tmp=modules/extdata/uri/target/deploy_tmp/ http://git-wip-us.apache.org/repos/asf/ignite/blob/ea63c2dc/modules/extdata/uri/pom.xml ---------------------------------------------------------------------- diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml index d5e6349..c5fb5cf 100644 --- a/modules/extdata/uri/pom.xml +++ b/modules/extdata/uri/pom.xml @@ -136,6 +136,8 @@ <phase>compile</phase> <configuration> <target> + <taskdef name="gar" classname="org.apache.ignite.util.antgar.IgniteDeploymentGarAntTask" /> + <!-- copying resources to classes --> <copy todir="${basedir}/target/classes"> <fileset dir="${basedir}/src/main/java"> @@ -144,23 +146,22 @@ </fileset> </copy> - <copy file="${settings.localRepository}/com/sun/mail/javax.mail/1.5.2/javax.mail-1.5.2.jar" todir="${basedir}/target/libs" /> + <mkdir dir="${basedir}/target/deploy_tmp/"/> + + <!--uri-classes.gar--> + <gar destfile="${basedir}/target/deploy2/uri-classes.gar" basedir="${basedir}/target/classes" /> + <!--Copy libs.--> <zip destfile="${basedir}/target/classes/lib/depend.jar" encoding="UTF-8"> <zipfileset dir="modules/uri-dependency/target/classes" /> </zip> - <copy file="${basedir}/target/classes/lib/depend.jar" todir="${basedir}/target/libs" /> - - <mkdir dir="${basedir}/target/deploy_tmp/"/> - - <taskdef name="gar" classname="org.apache.ignite.util.antgar.IgniteDeploymentGarAntTask" /> - - <gar destfile="${basedir}/target/deploy/uri-classes.gar" basedir="${basedir}/target/classes" /> - <gar destfile="${basedir}/target/deploy/uri-libs.gar" basedir="${basedir}/target/libs" /> - <copy file="${settings.localRepository}/com/sun/mail/javax.mail/1.5.2/javax.mail-1.5.2.jar" todir="${basedir}/target/classes/lib" /> + <!--uri-libs.gar--> + <gar destfile="${basedir}/target/deploy2/uri-libs.gar" basedir="${basedir}/target/classes/lib" /> + + <!--uri.gar--> <gar destfile="${basedir}/target/deploy/uri.gar" basedir="${basedir}/target/classes" /> <!--