ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [07/33] incubator-ignite git commit: # ignite-293: remove the rest of 'os/'
Date Tue, 10 Mar 2015 23:23:29 GMT
# ignite-293: remove the rest of 'os/'


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

Branch: refs/heads/ignite-439
Commit: a582ceca93495bcf5069bfb906e30e34b280c4b8
Parents: 2a68e64
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Mar 3 20:06:36 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Mar 3 20:06:36 2015 +0300

----------------------------------------------------------------------
 bin/include/target-classpath.sh                 |  2 +-
 .../ignite/internal/util/IgniteUtils.java       | 20 +++++---------------
 .../ignite/testframework/GridTestUtils.java     | 13 +------------
 pom.xml                                         |  2 +-
 4 files changed, 8 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a582ceca/bin/include/target-classpath.sh
----------------------------------------------------------------------
diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh
index 62c9ffa..871d517 100644
--- a/bin/include/target-classpath.sh
+++ b/bin/include/target-classpath.sh
@@ -19,7 +19,7 @@
 # Target class path resolver.
 #
 # Can be used like:
-#       . "${IGNITE_HOME}"/os/bin/include/target-classpath.sh
+#       . "${IGNITE_HOME}"/bin/include/target-classpath.sh
 # in other scripts to set classpath using libs from target folder.
 #
 # Will be excluded in release.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a582ceca/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index de71f59..1c33fe4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -30,10 +30,6 @@ import org.apache.ignite.internal.managers.deployment.*;
 import org.apache.ignite.internal.mxbean.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.version.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
 import org.apache.ignite.internal.processors.streamer.*;
 import org.apache.ignite.internal.transactions.*;
 import org.apache.ignite.internal.util.io.*;
@@ -41,6 +37,10 @@ import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.worker.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.plugin.extensions.communication.*;
+import org.apache.ignite.spi.*;
 import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.transactions.*;
 import org.jdk8.backport.*;
@@ -3149,14 +3149,7 @@ public abstract class IgniteUtils {
         if (file.exists())
             return file;
 
-        /*
-         * 3. Check development path.
-         */
-
-        if (home != null)
-            file = new File(home, "os/" + path);
-
-        return file.exists() ? file : null;
+        return null;
     }
 
     /**
@@ -3194,9 +3187,6 @@ public abstract class IgniteUtils {
     @Nullable public static URL resolveIgniteUrl(String path, boolean metaInf) {
         File f = resolveIgnitePath(path);
 
-        if (f == null)
-            f = resolveIgnitePath("os/" + path);
-
         if (f != null) {
             try {
                 // Note: we use that method's chain instead of File.getURL() with due

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a582ceca/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index 0449e48..ffd890e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -806,18 +806,7 @@ public final class GridTestUtils {
      * @see #getIgniteHome()
      */
     @Nullable public static File resolveIgnitePath(String path) {
-        return resolveIgnitePath(null, path);
-    }
-
-    /**
-     * @param igniteHome Optional ignite home path.
-     * @param path Path to resolve.
-     * @return Resolved path, or {@code null} if file cannot be resolved.
-     */
-    @Nullable public static File resolveIgnitePath(@Nullable String igniteHome, String path)
{
-        File file = resolvePath(igniteHome, path);
-
-        return file != null ? file : resolvePath(igniteHome, "os/" + path);
+        return resolvePath(null, path);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a582ceca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0ebc44..41e1172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1146,7 +1146,7 @@
                                         </replaceregexp>
 
                                         <replaceregexp byline="true">
-                                            <regexp pattern='SCRIPTS_HOME="\$\{IGNITE_HOME_TMP\}/os/bin"(\s*#.*)?'/>
+                                            <regexp pattern='SCRIPTS_HOME="\$\{IGNITE_HOME_TMP\}/bin"(\s*#.*)?'/>
                                             <substitution expression='SCRIPTS_HOME="$${IGNITE_HOME_TMP}/bin"'/>
                                             <fileset dir="${basedir}/target/release-package/bin">
                                                 <include name="**/*.sh"/>


Mime
View raw message