ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [23/50] [abbrv] incubator-ignite git commit: # ignite-63
Date Fri, 23 Jan 2015 09:02:31 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/tools/src/main/java/org/gridgain/grid/tools/marshaller/optimized/OptimizedClassNamesGenerator.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/gridgain/grid/tools/marshaller/optimized/OptimizedClassNamesGenerator.java b/modules/tools/src/main/java/org/gridgain/grid/tools/marshaller/optimized/OptimizedClassNamesGenerator.java
deleted file mode 100644
index 0940e2c..0000000
--- a/modules/tools/src/main/java/org/gridgain/grid/tools/marshaller/optimized/OptimizedClassNamesGenerator.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * 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.
- */
-
-package org.gridgain.grid.tools.marshaller.optimized;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-import java.util.jar.*;
-
-/**
- * Generates a file with preregistered class names.
- * <p>
- * This class should have the following modules with corresponding lib dependencies in its classpath:
- * <ul>
- * <li>src</li>
- * <li>scalar</li>
- * <li>visor</li>
- * </ul>
- * It {@code should NOT} have any {@code 'test'} modules in the class path.
- */
-public class OptimizedClassNamesGenerator {
-    /** Defines GridGain installation folder. */
-    public static final String GG_HOME_SYS_PROP = "GRIDGAIN_HOME";
-
-    /** Defines GridGain installation folder.  */
-    public static final String GG_HOME_ENV_VAR = "GRIDGAIN_HOME";
-
-    /** File name to generate. */
-    public static final String FILE_NAME = "optimized-classnames.properties";
-
-    /** Previous version file name. */
-    public static final String PREV_FILE_NAME = "optimized-classnames.previous.properties";
-
-    /** */
-    private Collection<String> clsNames;
-
-    /** Collection of classes without serialVersionUID. */
-    private Collection<Class> clsWithoutSerialVersionUID;
-
-    /** */
-    private int urlPrefixLen;
-
-    /**
-     * @param file Output file.
-     * @param prev Previous version file.
-     * @throws URISyntaxException If this URL is not formatted strictly according to
-     * to RFC2396 and cannot be converted to a URI.
-     * @throws IOException If an I/O error occurs while writing stream header.
-     */
-    public void writeClassNames(File file, File prev) throws IOException, URISyntaxException {
-        assert file != null;
-        assert prev != null;
-
-        clsNames = new HashSet<>();
-
-        clsWithoutSerialVersionUID = new ArrayList<>();
-
-        URL[] urls = ((URLClassLoader)OptimizedClassNamesGenerator.class.getClassLoader()).getURLs();
-
-        System.out.println("Printing class loader URLs: ");
-
-        for (URL url : urls)
-            System.out.println("  " + url);
-
-        for (URL url : urls) {
-            File f = new File(url.toURI());
-
-            if (!f.exists())
-                System.err.println("Unrecognized URL: " + url);
-            else {
-                urlPrefixLen = f.getPath().length() + 1;
-
-                processFile(f);
-            }
-        }
-
-        if (clsWithoutSerialVersionUID.size() > 0) {
-            StringBuilder sb = new StringBuilder("No serialVersionUID field in class(es): ");
-
-            for (Class cls : clsWithoutSerialVersionUID)
-                sb.append(cls.getName()).append(", ");
-
-            sb.setLength(sb.length() - ", ".length());
-
-            throw new RuntimeException(sb.toString());
-        }
-
-        Collection<String> prevCls = previousVersionClasses(prev);
-
-        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8"))) {
-            for (String clsName : prevCls) {
-                writer.write(clsName);
-                writer.newLine();
-
-                clsNames.remove(clsName);
-            }
-
-            List<String> sorted = new ArrayList<>(clsNames);
-
-            Collections.sort(sorted);
-
-            for (String clsName : sorted) {
-                writer.write(clsName);
-                writer.newLine();
-            }
-        }
-    }
-
-    /**
-     * @param file Previous version file.
-     * @return Class names.
-     * @throws IOException In case of error.
-     */
-    private Collection<String> previousVersionClasses(File file) throws IOException {
-        assert file != null && file.exists();
-
-        BufferedReader rdr = new BufferedReader(new FileReader(file));
-
-        Collection<String> names = new ArrayList<>(30000);
-
-        String name;
-
-        while ((name = rdr.readLine()) != null)
-            names.add(name);
-
-        return names;
-    }
-
-    /**
-     * @param file File to process.
-     * @throws IOException If an I/O error occurs while writing stream header.
-     */
-    private void processFile(File file) throws IOException {
-        if (file.isDirectory())
-            for (File childFile : file.listFiles())
-                processFile(childFile);
-        else if (file.getName().toLowerCase().endsWith(".jar"))
-            processJar(file);
-        else if (file.getName().toLowerCase().endsWith(".class"))
-            processClass(trimClassExtension(
-                file.getPath().substring(urlPrefixLen).replace(File.separatorChar, '.')
-            ));
-    }
-
-    /**
-     * @param jarFile File to process.
-     * @throws IOException If an I/O error occurs while writing stream header.
-     */
-    private void processJar(File jarFile) throws IOException {
-        JarInputStream jin = new JarInputStream(new BufferedInputStream(new FileInputStream(jarFile)));
-
-        try {
-            JarEntry jarEntry;
-
-            while ((jarEntry = jin.getNextJarEntry()) != null) {
-                if (jarEntry.isDirectory() || !jarEntry.getName().toLowerCase().endsWith(".class"))
-                    continue;
-
-                processClass(trimClassExtension(jarEntry.getName().replace('/', '.')));
-            }
-        }
-        finally {
-            close(jin);
-        }
-    }
-
-    /**
-     * @param name Class name to process.
-     */
-    @SuppressWarnings( {"ErrorNotRethrown"})
-    private void processClass(String name) {
-        try {
-            Class cls = Class.forName(name, false, OptimizedClassNamesGenerator.class.getClassLoader());
-
-            if (isAccepted(cls)) {
-                checkSerialVersionUid(cls);
-
-                clsNames.add(name);
-            }
-        }
-        catch (SecurityException | LinkageError ignored) {
-            // No-op.
-        }
-        catch (ClassNotFoundException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    /**
-     * Checks serialVersionUID field in provided class.
-     *
-     * @param cls Class.
-     */
-    private void checkSerialVersionUid(Class cls) {
-        // Check only GridGain classes.
-        if (cls.isEnum() || cls.getSimpleName().isEmpty() || (!cls.getName().startsWith("org.gridgain.grid") &&
-            !cls.getName().startsWith("org.gridgain.client")))
-            return;
-
-        try {
-            Field field = cls.getDeclaredField("serialVersionUID");
-
-            if (!field.getType().equals(long.class))
-                throw new RuntimeException("serialVersionUID field is not long in class: " + cls.getName());
-
-            int mod = field.getModifiers();
-
-            if (!Modifier.isStatic(mod))
-                throw new RuntimeException("serialVersionUID field is not static in class: " + cls.getName());
-
-            if (!Modifier.isFinal(mod))
-                throw new RuntimeException("serialVersionUID field is not final in class: " + cls.getName());
-        }
-        catch (NoSuchFieldException ignored) {
-            clsWithoutSerialVersionUID.add(cls);
-        }
-    }
-
-    /**
-     * @param cls A class to examine.
-     * @return Whether to add the class.
-     */
-    private static boolean isAccepted(Class cls) {
-        return !(cls.isInterface() || (cls.getModifiers() & Modifier.ABSTRACT) != 0 || isTest(cls)) &&
-            (cls.isEnum() || Serializable.class.isAssignableFrom(cls));
-    }
-
-    /**
-     * Checks if class is a test case.
-     *
-     * @param cls Class.
-     * @return {@code True} if test case.
-     */
-    private static boolean isTest(Class cls) {
-        for (Class c = cls; c != Object.class; c = c.getSuperclass())
-            if (c.getName().startsWith("junit.framework") || // JUnit3
-                c.getName().startsWith("org.junit") || // JUnit4
-                c.getName().startsWith("org.testing")) // TestNG
-                return true;
-
-        return false;
-    }
-
-    /**
-     * @param path Path.
-     * @return Trimmed path.
-     */
-    private static String trimClassExtension(String path) {
-        return path.substring(0, path.length() - 6);
-    }
-
-    /**
-     * @param closeable An object to close.
-     */
-    private static void close(Closeable closeable) {
-        try {
-            closeable.close();
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * @param args Command line arguments, none expected.
-     * @throws Exception If generation failed.
-     */
-    public static void main(String[] args) throws Exception {
-        File dir;
-
-        if (args.length > 0 && args[0] != null && !args[0].isEmpty())
-            dir = new File(args[0], "/org/gridgain/grid/marshaller/optimized");
-        else {
-            String home = home();
-
-            if (home == null)
-                throw new Exception("Failed to find GridGain home.");
-
-            dir = new File(home, "/os/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized");
-        }
-
-        if (!dir.exists())
-            throw new Exception("Optimized marshaller path does not exist: " + dir);
-
-        if (!dir.isDirectory())
-            throw new Exception("Destination path is not a directory: " + dir);
-
-        new OptimizedClassNamesGenerator().writeClassNames(new File(dir, FILE_NAME), new File(dir, PREV_FILE_NAME));
-    }
-
-    /**
-     * Retrieves {@code GRIDGAIN_HOME} property. The property is retrieved from system
-     * properties or from environment in that order.
-     *
-     * @return {@code GRIDGAIN_HOME} property.
-     */
-    private static String home() {
-        String home = System.getProperty(GG_HOME_SYS_PROP);
-
-        if (home == null || home.isEmpty()) {
-            home = System.getenv(GG_HOME_ENV_VAR);
-
-            if (home == null || home.isEmpty())
-                return null;
-        }
-
-        return home;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/tools/src/main/java/org/gridgain/grid/util/antgar/GridDeploymentGarAntTask.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/gridgain/grid/util/antgar/GridDeploymentGarAntTask.java b/modules/tools/src/main/java/org/gridgain/grid/util/antgar/GridDeploymentGarAntTask.java
deleted file mode 100644
index 5af4b7c..0000000
--- a/modules/tools/src/main/java/org/gridgain/grid/util/antgar/GridDeploymentGarAntTask.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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.
- */
-
-package org.gridgain.grid.util.antgar;
-
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.zip.*;
-import java.io.*;
-
-/**
- * Ant task for generating GAR file. This task extends standard {@code zip} Ant task and
- * has two parameters:
- * <ul>
- * <li>{@code basedir} - Base directory for GAR archive.</li>
- * <li>
- *      {@code descrdir} - Directory where descriptor {@link #DESC_NAME} file is located.
- *      If not specified, it is assumed that GridGain descriptor will be searched in base directory
- *      (see {@link #setBasedir(File)}). <b>Note</b> further that GAR descriptor file is fully optional
- *      itself for GAR archive.
- * </li>
- * </ul>
- */
-public class GridDeploymentGarAntTask extends Zip {
-    /** GAR descriptor name. Its value is {@code gridgain.xml}. */
-    public static final String DESC_NAME = "gridgain.xml";
-
-    /**  Default descriptor path. */
-    private static final String DESC_PATH = "META-INF";
-
-    /** Descriptor directory. */
-    private File descDir;
-
-    /** Descriptor file name. */
-    private File descFile;
-
-    /** Base directory of Ant task. */
-    private File baseDir;
-
-    /**
-     * Creates ant task with default values.
-     */
-    public GridDeploymentGarAntTask() {
-        archiveType = "gar";
-        emptyBehavior = "create";
-    }
-
-    /**
-     * Sets the directory where descriptor is located. This parameter is optional and if not set Ant task
-     * will search for descriptor file in base directory. <b>Note</b> further that GAR descriptor file is fully optional
-     * itself for GAR archive.
-     *
-     * @param descDir Descriptor directory.
-     */
-    public void setDescrdir(File descDir) {
-        assert descDir != null;
-
-        this.descDir = descDir;
-    }
-
-    /**
-     * Sets base directory for the archive.
-     *
-     * @param baseDir Base archive directory to set.
-     */
-    @Override public void setBasedir(File baseDir) {
-        super.setBasedir(baseDir);
-
-        this.baseDir = baseDir;
-    }
-
-    /**
-     * Executes the Ant task.
-     */
-    @Override public void execute() {
-        setEncoding("UTF8");
-
-        // Otherwise super method will throw exception.
-        if (baseDir != null && baseDir.isDirectory()) {
-
-            File[] files = baseDir.listFiles(new FileFilter() {
-                /** {@inheritDoc} */
-                @Override public boolean accept(File pathname) {
-                    return pathname.isDirectory() && pathname.getName().equals(DESC_PATH);
-                }
-            });
-
-            if (files.length == 1) {
-                files = files[0].listFiles(new FileFilter() {
-                    /** {@inheritDoc} */
-                    @Override public boolean accept(File pathname) {
-                        return !pathname.isDirectory() && pathname.getName().equals(DESC_NAME);
-                    }
-                });
-            }
-
-            File desc = null;
-
-            if (files.length == 1)
-                desc = files[0];
-
-            // File was defined in source.
-            if (desc != null) {
-                if (descDir != null) {
-                    throw new BuildException("GridGain descriptor '" + DESC_NAME + "' is already " +
-                        "defined in source folder.");
-                }
-            }
-            // File wasn't defined in source and could be defined using 'descrdir' attribute.
-            // Try to find the descriptor in defined directory.
-            else if (descDir != null) {
-                if (!descDir.isDirectory()) {
-                    throw new BuildException(
-                        "'descrdir' attribute isn't folder [dir=" + descDir.getAbsolutePath() + ']');
-                }
-
-                descFile = new File(getFullPath(descDir.getAbsolutePath(), DESC_NAME));
-
-                if (!descFile.exists()) {
-                    throw new BuildException("Folder doesn't contain GridGain descriptor [path=" +
-                            descDir.getAbsolutePath() + ']');
-                }
-            }
-        }
-
-        super.execute();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void initZipOutputStream(ZipOutputStream zOut) throws IOException {
-        if (descFile != null)
-            zipFile(descFile, zOut, getFullPath(DESC_PATH, DESC_NAME), ArchiveFileSet.DEFAULT_FILE_MODE);
-    }
-
-    /**
-     * Constructs full path given two other paths.
-     *
-     * @param subPath1 1st path.
-     * @param subPath2 2nd path.
-     * @return Full path.
-     */
-    private static String getFullPath(String subPath1, String subPath2) {
-        assert subPath1 != null;
-        assert subPath2 != null;
-
-        char c = subPath1.charAt(subPath1.length() - 1);
-
-        boolean b1 = c == '/' || c == '\\';
-
-        c = subPath2.charAt(0);
-
-        boolean b2 = c == '/' || c == '\\';
-
-        return b1 != b2 ? subPath1 + subPath2 : !b1 ? subPath1 + '/' + subPath2 :
-            subPath1.substring(0, subPath1.length() - 1) + File.separatorChar + subPath2.substring(1);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/tools/src/main/java/org/gridgain/grid/util/antgar/package.html
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/gridgain/grid/util/antgar/package.html b/modules/tools/src/main/java/org/gridgain/grid/util/antgar/package.html
deleted file mode 100644
index a4c97e0..0000000
--- a/modules/tools/src/main/java/org/gridgain/grid/util/antgar/package.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  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.
-  -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body>
-<!-- Package description. -->
-Contains Ant task for generating GAR file.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java
index cb079f1..e4d8a1c 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/testsuites/GridToolsSelfTestSuite.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.testsuites;
 
 import junit.framework.*;
-import org.gridgain.grid.tools.*;
+import org.apache.ignite.tools.*;
 
 /**
  * Tools self-test suite.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java
new file mode 100644
index 0000000..248c57d
--- /dev/null
+++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/GridToolsSelfTest.java
@@ -0,0 +1,384 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.tools;
+
+import org.apache.tools.ant.*;
+import org.gridgain.grid.util.antgar.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.config.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.zip.*;
+
+/**
+ * Tests for Ant task generating GAR file.
+ */
+@GridCommonTest(group = "Tools")
+public class GridToolsSelfTest extends GridCommonAbstractTest {
+    /**
+     * @throws Exception If failed.
+     */
+    @SuppressWarnings({"TypeMayBeWeakened"})
+    public void testCorrectAntGarTask() throws Exception {
+        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
+        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
+        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_0";
+        String metaDirName = baseDirName + File.separator + "META-INF";
+        String garFileName = baseDirName + ".gar";
+        String garDescDirName =
+            U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath()
+            + File.separator + "gridgain.xml";
+
+        // Make base and META-INF dir.
+        boolean mkdir = new File(baseDirName).mkdirs();
+
+        assert mkdir;
+
+        mkdir = new File(metaDirName).mkdirs();
+
+        assert mkdir;
+
+        // Make Gar file
+        U.copy(new File(garDescDirName), new File(metaDirName + File.separator + "gridgain.xml"), true);
+
+        // Copy files to basedir
+        U.copy(new File(srcDirName), new File(baseDirName), true);
+
+        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
+
+        Project garProject = new Project();
+
+        garProject.setName("Gar test project");
+
+        garTask.setDestFile(new File(garFileName));
+        garTask.setBasedir(new File(baseDirName));
+        garTask.setProject(garProject);
+
+        garTask.execute();
+
+        File garFile = new File(garFileName);
+
+        assert garFile.exists();
+
+        boolean res = checkStructure(garFile, true);
+
+        assert res;
+    }
+
+    /**
+     * @param garFile GAR file.
+     * @param hasDescr Whether GAR file has descriptor.
+     * @throws IOException If GAR file is not found.
+     * @return Whether GAR file structure is correct.
+     */
+    private boolean checkStructure(File garFile, boolean hasDescr) throws IOException {
+        ZipFile zip = new ZipFile(garFile);
+
+        String descr = "META-INF/gridgain.xml";
+
+        ZipEntry entry = zip.getEntry(descr);
+
+        if (entry == null && !hasDescr) {
+            if (log().isInfoEnabled()) {
+                log().info("Process deployment without descriptor file [path=" +
+                        descr + ", file=" + garFile.getAbsolutePath() + ']');
+            }
+
+            return true;
+        }
+        else if (entry != null && hasDescr) {
+            InputStream in = null;
+
+            try {
+                in = new BufferedInputStream(zip.getInputStream(entry));
+
+                return true;
+            }
+            finally {
+                U.close(in, log());
+            }
+        }
+        else
+            return false;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testAntGarTaskWithExternalP2PDescriptor() throws Exception {
+        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
+        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
+        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_1";
+        String metaDirName = baseDirName + File.separator + "META-INF";
+        String garFileName = baseDirName + ".gar";
+        String garDescrDirName =
+            U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath();
+
+        // Make base and META-INF dir.
+        boolean mkdir = new File(baseDirName).mkdirs();
+
+        assert mkdir;
+
+        mkdir = new File(metaDirName).mkdirs();
+
+        assert mkdir;
+
+        // Copy files to basedir
+        U.copy(new File(srcDirName), new File(baseDirName), true);
+
+        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
+
+        Project garProject = new Project();
+
+        garProject.setName("Gar test project");
+
+        garTask.setDestFile(new File(garFileName));
+        garTask.setDescrdir(new File(garDescrDirName));
+        garTask.setBasedir(new File(baseDirName));
+        garTask.setProject(garProject);
+
+        garTask.execute();
+
+        File garFile = new File(garFileName);
+
+        assert garFile.exists();
+
+        boolean res = checkStructure(garFile, true);
+
+        assert res;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testAntGarTaskWithDoubleP2PDescriptor() throws Exception {
+        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
+        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
+        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_2";
+        String metaDirName = baseDirName + File.separator + "META-INF";
+        String garFileName = baseDirName + ".gar";
+        String garDescrDirName =
+            U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath()
+            + File.separator + "gridgain.xml";
+
+        // Make base and META-INF dir.
+        boolean mkdir = new File(baseDirName).mkdirs();
+
+        assert mkdir;
+
+        mkdir = new File(metaDirName).mkdirs();
+
+        assert mkdir;
+
+        // Make Gar file
+        U.copy(new File(garDescrDirName), new File(metaDirName + File.separator + "gridgain.xml"), true);
+
+        // Copy files to basedir
+        U.copy(new File(srcDirName), new File(baseDirName), true);
+
+        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
+
+        Project garProject = new Project();
+
+        garProject.setName("Gar test project");
+
+        garTask.setDestFile(new File(garFileName));
+        garTask.setDescrdir(new File(garDescrDirName));
+        garTask.setBasedir(new File(baseDirName));
+        garTask.setProject(garProject);
+
+        try {
+            garTask.execute();
+
+            assert false;
+        }
+        catch (BuildException e) {
+            if (log().isInfoEnabled())
+                log().info(e.getMessage());
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testAntGarTaskWithDirDescriptor() throws Exception {
+        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
+        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
+        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_3";
+        String metaDirName = baseDirName + File.separator + "META-INF";
+        String garFileName = baseDirName + ".gar";
+
+        // Make base and META-INF dir.
+        boolean mkdir = new File(baseDirName).mkdirs();
+
+        assert mkdir;
+
+        mkdir = new File(metaDirName).mkdirs();
+
+        assert mkdir;
+
+        // Copy files to basedir
+        U.copy(new File(srcDirName), new File(baseDirName), true);
+
+        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
+
+        Project garProject = new Project();
+
+        garProject.setName("Gar test project");
+
+        garTask.setDestFile(new File(garFileName));
+        garTask.setBasedir(new File(baseDirName));
+        garTask.setProject(garProject);
+        garTask.setDescrdir(new File(garFileName));
+
+        try {
+            garTask.execute();
+
+            assert false;
+        }
+        catch (BuildException e) {
+            if (log().isInfoEnabled())
+                log().info(e.getMessage());
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    @SuppressWarnings({"TypeMayBeWeakened"})
+    public void testAntGarTaskWithNullDescriptor() throws Exception {
+        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
+        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
+        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_4";
+        String metaDirName = baseDirName + File.separator + "META-INF";
+        String garFileName = baseDirName + ".gar";
+
+        // Make base and META-INF dir.
+        boolean mkdir = new File(baseDirName).mkdirs();
+
+        assert mkdir;
+
+        mkdir = new File(metaDirName).mkdirs();
+
+        assert mkdir;
+
+        // Copy files to basedir
+        U.copy(new File(srcDirName), new File(baseDirName), true);
+
+        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
+
+        Project garProject = new Project();
+
+        garProject.setName("Gar test project");
+
+        garTask.setDestFile(new File(garFileName));
+        garTask.setBasedir(new File(baseDirName));
+        garTask.setProject(garProject);
+
+        try {
+            garTask.execute();
+        }
+        catch (BuildException e) {
+            if (log().isInfoEnabled())
+                log().info(e.getMessage());
+
+            assert false;
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testAntGarTaskWithFileBaseDir() throws Exception {
+        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
+        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
+        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_5";
+        String metaDirName = baseDirName + File.separator + "META-INF";
+        String garFileName = baseDirName + ".gar";
+
+        // Make base and META-INF dir.
+        boolean mkdir = new File(baseDirName).mkdirs();
+
+        assert mkdir;
+
+        mkdir = new File(metaDirName).mkdirs();
+
+        assert mkdir;
+
+        // Copy files to basedir
+        U.copy(new File(srcDirName), new File(baseDirName), true);
+
+        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
+
+        Project garProject = new Project();
+
+        garProject.setName("Gar test project");
+
+        garTask.setDestFile(new File(garFileName));
+        garTask.setBasedir(new File(garFileName));
+        garTask.setProject(garProject);
+        garTask.setDescrdir(new File(garFileName));
+
+        try {
+            garTask.execute();
+
+            assert false;
+        }
+        catch (BuildException e) {
+            if (log().isInfoEnabled())
+                log().info(e.getMessage());
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testAntGarTaskToString() throws Exception {
+        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
+        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
+        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_6";
+        String metaDirName = baseDirName + File.separator + "META-INF";
+        String garFileName = baseDirName + ".gar";
+
+        // Make base and META-INF dir.
+        boolean mkdir = new File(baseDirName).mkdirs();
+
+        assert mkdir;
+
+        mkdir = new File(metaDirName).mkdirs();
+
+        assert mkdir;
+
+        // Copy files to basedir
+        U.copy(new File(srcDirName), new File(baseDirName), true);
+
+        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
+
+        Project garProject = new Project();
+
+        garProject.setName("Gar test project");
+
+        garTask.setDestFile(new File(garFileName));
+        garTask.setBasedir(new File(garFileName));
+        garTask.setProject(garProject);
+        garTask.setDescrdir(new File(garFileName));
+
+        garTask.toString();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml b/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml
new file mode 100644
index 0000000..869695b
--- /dev/null
+++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/gartask/META-INF/gridgain.xml
@@ -0,0 +1,38 @@
+<?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.
+  -->
+
+<!--
+    Spring configuration file for test classes in gar-file.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+    <description>Gridgain Spring configuration file in gar-file.</description>
+
+    <!--
+        Test tasks specification.
+    -->
+    <util:list id="tasks">
+        <value>org.gridgain.grid.tests.p2p.GridP2PTestTask</value>
+        <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value>
+    </util:list>
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/urideploy/src/test/java/org/apache/ignite/tools/package.html
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/tools/package.html b/modules/urideploy/src/test/java/org/apache/ignite/tools/package.html
new file mode 100644
index 0000000..135eb1a
--- /dev/null
+++ b/modules/urideploy/src/test/java/org/apache/ignite/tools/package.html
@@ -0,0 +1,24 @@
+<!--
+  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.
+  -->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<body>
+    <!-- Package description. -->
+    Contains internal tests or test related classes and interfaces.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/urideploy/src/test/java/org/gridgain/grid/tools/GridToolsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/gridgain/grid/tools/GridToolsSelfTest.java b/modules/urideploy/src/test/java/org/gridgain/grid/tools/GridToolsSelfTest.java
deleted file mode 100644
index 9a5dcff..0000000
--- a/modules/urideploy/src/test/java/org/gridgain/grid/tools/GridToolsSelfTest.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * 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.
- */
-
-package org.gridgain.grid.tools;
-
-import org.apache.tools.ant.*;
-import org.gridgain.grid.util.antgar.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.testframework.config.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.zip.*;
-
-/**
- * Tests for Ant task generating GAR file.
- */
-@GridCommonTest(group = "Tools")
-public class GridToolsSelfTest extends GridCommonAbstractTest {
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TypeMayBeWeakened"})
-    public void testCorrectAntGarTask() throws Exception {
-        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
-        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
-        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_0";
-        String metaDirName = baseDirName + File.separator + "META-INF";
-        String garFileName = baseDirName + ".gar";
-        String garDescDirName =
-            U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath()
-            + File.separator + "gridgain.xml";
-
-        // Make base and META-INF dir.
-        boolean mkdir = new File(baseDirName).mkdirs();
-
-        assert mkdir;
-
-        mkdir = new File(metaDirName).mkdirs();
-
-        assert mkdir;
-
-        // Make Gar file
-        U.copy(new File(garDescDirName), new File(metaDirName + File.separator + "gridgain.xml"), true);
-
-        // Copy files to basedir
-        U.copy(new File(srcDirName), new File(baseDirName), true);
-
-        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
-
-        Project garProject = new Project();
-
-        garProject.setName("Gar test project");
-
-        garTask.setDestFile(new File(garFileName));
-        garTask.setBasedir(new File(baseDirName));
-        garTask.setProject(garProject);
-
-        garTask.execute();
-
-        File garFile = new File(garFileName);
-
-        assert garFile.exists();
-
-        boolean res = checkStructure(garFile, true);
-
-        assert res;
-    }
-
-    /**
-     * @param garFile GAR file.
-     * @param hasDescr Whether GAR file has descriptor.
-     * @throws IOException If GAR file is not found.
-     * @return Whether GAR file structure is correct.
-     */
-    private boolean checkStructure(File garFile, boolean hasDescr) throws IOException {
-        ZipFile zip = new ZipFile(garFile);
-
-        String descr = "META-INF/gridgain.xml";
-
-        ZipEntry entry = zip.getEntry(descr);
-
-        if (entry == null && !hasDescr) {
-            if (log().isInfoEnabled()) {
-                log().info("Process deployment without descriptor file [path=" +
-                        descr + ", file=" + garFile.getAbsolutePath() + ']');
-            }
-
-            return true;
-        }
-        else if (entry != null && hasDescr) {
-            InputStream in = null;
-
-            try {
-                in = new BufferedInputStream(zip.getInputStream(entry));
-
-                return true;
-            }
-            finally {
-                U.close(in, log());
-            }
-        }
-        else
-            return false;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testAntGarTaskWithExternalP2PDescriptor() throws Exception {
-        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
-        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
-        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_1";
-        String metaDirName = baseDirName + File.separator + "META-INF";
-        String garFileName = baseDirName + ".gar";
-        String garDescrDirName =
-            U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath();
-
-        // Make base and META-INF dir.
-        boolean mkdir = new File(baseDirName).mkdirs();
-
-        assert mkdir;
-
-        mkdir = new File(metaDirName).mkdirs();
-
-        assert mkdir;
-
-        // Copy files to basedir
-        U.copy(new File(srcDirName), new File(baseDirName), true);
-
-        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
-
-        Project garProject = new Project();
-
-        garProject.setName("Gar test project");
-
-        garTask.setDestFile(new File(garFileName));
-        garTask.setDescrdir(new File(garDescrDirName));
-        garTask.setBasedir(new File(baseDirName));
-        garTask.setProject(garProject);
-
-        garTask.execute();
-
-        File garFile = new File(garFileName);
-
-        assert garFile.exists();
-
-        boolean res = checkStructure(garFile, true);
-
-        assert res;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testAntGarTaskWithDoubleP2PDescriptor() throws Exception {
-        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
-        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
-        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_2";
-        String metaDirName = baseDirName + File.separator + "META-INF";
-        String garFileName = baseDirName + ".gar";
-        String garDescrDirName =
-            U.resolveGridGainPath(GridTestProperties.getProperty("ant.gar.descriptor.dir")).getAbsolutePath()
-            + File.separator + "gridgain.xml";
-
-        // Make base and META-INF dir.
-        boolean mkdir = new File(baseDirName).mkdirs();
-
-        assert mkdir;
-
-        mkdir = new File(metaDirName).mkdirs();
-
-        assert mkdir;
-
-        // Make Gar file
-        U.copy(new File(garDescrDirName), new File(metaDirName + File.separator + "gridgain.xml"), true);
-
-        // Copy files to basedir
-        U.copy(new File(srcDirName), new File(baseDirName), true);
-
-        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
-
-        Project garProject = new Project();
-
-        garProject.setName("Gar test project");
-
-        garTask.setDestFile(new File(garFileName));
-        garTask.setDescrdir(new File(garDescrDirName));
-        garTask.setBasedir(new File(baseDirName));
-        garTask.setProject(garProject);
-
-        try {
-            garTask.execute();
-
-            assert false;
-        }
-        catch (BuildException e) {
-            if (log().isInfoEnabled())
-                log().info(e.getMessage());
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testAntGarTaskWithDirDescriptor() throws Exception {
-        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
-        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
-        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_3";
-        String metaDirName = baseDirName + File.separator + "META-INF";
-        String garFileName = baseDirName + ".gar";
-
-        // Make base and META-INF dir.
-        boolean mkdir = new File(baseDirName).mkdirs();
-
-        assert mkdir;
-
-        mkdir = new File(metaDirName).mkdirs();
-
-        assert mkdir;
-
-        // Copy files to basedir
-        U.copy(new File(srcDirName), new File(baseDirName), true);
-
-        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
-
-        Project garProject = new Project();
-
-        garProject.setName("Gar test project");
-
-        garTask.setDestFile(new File(garFileName));
-        garTask.setBasedir(new File(baseDirName));
-        garTask.setProject(garProject);
-        garTask.setDescrdir(new File(garFileName));
-
-        try {
-            garTask.execute();
-
-            assert false;
-        }
-        catch (BuildException e) {
-            if (log().isInfoEnabled())
-                log().info(e.getMessage());
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings({"TypeMayBeWeakened"})
-    public void testAntGarTaskWithNullDescriptor() throws Exception {
-        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
-        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
-        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_4";
-        String metaDirName = baseDirName + File.separator + "META-INF";
-        String garFileName = baseDirName + ".gar";
-
-        // Make base and META-INF dir.
-        boolean mkdir = new File(baseDirName).mkdirs();
-
-        assert mkdir;
-
-        mkdir = new File(metaDirName).mkdirs();
-
-        assert mkdir;
-
-        // Copy files to basedir
-        U.copy(new File(srcDirName), new File(baseDirName), true);
-
-        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
-
-        Project garProject = new Project();
-
-        garProject.setName("Gar test project");
-
-        garTask.setDestFile(new File(garFileName));
-        garTask.setBasedir(new File(baseDirName));
-        garTask.setProject(garProject);
-
-        try {
-            garTask.execute();
-        }
-        catch (BuildException e) {
-            if (log().isInfoEnabled())
-                log().info(e.getMessage());
-
-            assert false;
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testAntGarTaskWithFileBaseDir() throws Exception {
-        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
-        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
-        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_5";
-        String metaDirName = baseDirName + File.separator + "META-INF";
-        String garFileName = baseDirName + ".gar";
-
-        // Make base and META-INF dir.
-        boolean mkdir = new File(baseDirName).mkdirs();
-
-        assert mkdir;
-
-        mkdir = new File(metaDirName).mkdirs();
-
-        assert mkdir;
-
-        // Copy files to basedir
-        U.copy(new File(srcDirName), new File(baseDirName), true);
-
-        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
-
-        Project garProject = new Project();
-
-        garProject.setName("Gar test project");
-
-        garTask.setDestFile(new File(garFileName));
-        garTask.setBasedir(new File(garFileName));
-        garTask.setProject(garProject);
-        garTask.setDescrdir(new File(garFileName));
-
-        try {
-            garTask.execute();
-
-            assert false;
-        }
-        catch (BuildException e) {
-            if (log().isInfoEnabled())
-                log().info(e.getMessage());
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testAntGarTaskToString() throws Exception {
-        String tmpDirName = GridTestProperties.getProperty("ant.gar.tmpdir");
-        String srcDirName = GridTestProperties.getProperty("ant.gar.srcdir");
-        String baseDirName = tmpDirName + File.separator + System.currentTimeMillis() + "_6";
-        String metaDirName = baseDirName + File.separator + "META-INF";
-        String garFileName = baseDirName + ".gar";
-
-        // Make base and META-INF dir.
-        boolean mkdir = new File(baseDirName).mkdirs();
-
-        assert mkdir;
-
-        mkdir = new File(metaDirName).mkdirs();
-
-        assert mkdir;
-
-        // Copy files to basedir
-        U.copy(new File(srcDirName), new File(baseDirName), true);
-
-        GridDeploymentGarAntTask garTask = new GridDeploymentGarAntTask();
-
-        Project garProject = new Project();
-
-        garProject.setName("Gar test project");
-
-        garTask.setDestFile(new File(garFileName));
-        garTask.setBasedir(new File(garFileName));
-        garTask.setProject(garProject);
-        garTask.setDescrdir(new File(garFileName));
-
-        garTask.toString();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/urideploy/src/test/java/org/gridgain/grid/tools/gartask/META-INF/gridgain.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/gridgain/grid/tools/gartask/META-INF/gridgain.xml b/modules/urideploy/src/test/java/org/gridgain/grid/tools/gartask/META-INF/gridgain.xml
deleted file mode 100644
index 869695b..0000000
--- a/modules/urideploy/src/test/java/org/gridgain/grid/tools/gartask/META-INF/gridgain.xml
+++ /dev/null
@@ -1,38 +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.
-  -->
-
-<!--
-    Spring configuration file for test classes in gar-file.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-    <description>Gridgain Spring configuration file in gar-file.</description>
-
-    <!--
-        Test tasks specification.
-    -->
-    <util:list id="tasks">
-        <value>org.gridgain.grid.tests.p2p.GridP2PTestTask</value>
-        <value>org.apache.ignite.spi.deployment.uri.tasks.GridUriDeploymentTestWithNameTask0</value>
-    </util:list>
-</beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/modules/urideploy/src/test/java/org/gridgain/grid/tools/package.html
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/gridgain/grid/tools/package.html b/modules/urideploy/src/test/java/org/gridgain/grid/tools/package.html
deleted file mode 100644
index 135eb1a..0000000
--- a/modules/urideploy/src/test/java/org/gridgain/grid/tools/package.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  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.
-  -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body>
-    <!-- Package description. -->
-    Contains internal tests or test related classes and interfaces.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf70fa4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5978b52..4e1b8ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -592,7 +592,7 @@
                                 <configuration>
                                     <taglets>
                                         <taglet>
-                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
+                                            <tagletClass>org.apache.ignite.tools.javadoc.GridLinkTaglet</tagletClass>
                                             <tagletArtifact>
                                                 <groupId>org.apache.ignite</groupId>
                                                 <artifactId>ignite-tools</artifactId>
@@ -791,7 +791,7 @@
                                 <configuration>
                                     <taglets>
                                         <taglet>
-                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
+                                            <tagletClass>org.apache.ignite.tools.javadoc.GridLinkTaglet</tagletClass>
                                             <tagletArtifact>
                                                 <groupId>org.apache.ignite</groupId>
                                                 <artifactId>ignite-tools</artifactId>
@@ -1005,7 +1005,7 @@
                                 <configuration>
                                     <taglets>
                                         <taglet>
-                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
+                                            <tagletClass>org.apache.ignite.tools.javadoc.GridLinkTaglet</tagletClass>
                                             <tagletArtifact>
                                                 <groupId>org.apache.ignite</groupId>
                                                 <artifactId>ignite-tools</artifactId>
@@ -1127,7 +1127,7 @@
                                         <!-- todo IGNITE-40 Uncomment javadoc checking. -->
 
                                         <!--<taskdef name="doctask"-->
-                                                 <!--classname="org.gridgain.grid.tools.ant.beautifier.GridJavadocAntTask"/>-->
+                                                 <!--classname="org.apache.ignite.tools.ant.beautifier.GridJavadocAntTask"/>-->
 
                                         <!--<doctask css="dotted" dir="target/javadoc/core">-->
                                             <!--<include name="**/*.html"/>-->


Mime
View raw message