ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: # IGNITE-330 Demo WIP
Date Fri, 20 Mar 2015 16:09:25 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-45-330 [created] 07238aaaf


# IGNITE-330 Demo WIP


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

Branch: refs/heads/ignite-45-330
Commit: 07238aaaf1170d8becc955a67688554193330366
Parents: b57e47e
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Mar 20 23:09:25 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Mar 20 23:09:25 2015 +0700

----------------------------------------------------------------------
 assembly/release-fabric.xml               |  1 +
 bin/ignite-schema-import.bat              |  2 +-
 bin/ignite-schema-import.sh               |  4 +-
 examples/schema-import/db-demo-script.bat | 99 --------------------------
 4 files changed, 4 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07238aaa/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index 9bbb9e6..442bbe5 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -69,6 +69,7 @@
             <outputDirectory>/examples</outputDirectory>
             <includes>
                 <include>rest/**</include>
+                <include>schema-import/**</include>
             </includes>
         </fileSet>
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07238aaa/bin/ignite-schema-import.bat
----------------------------------------------------------------------
diff --git a/bin/ignite-schema-import.bat b/bin/ignite-schema-import.bat
index fc01306..864b6b4 100644
--- a/bin/ignite-schema-import.bat
+++ b/bin/ignite-schema-import.bat
@@ -90,7 +90,7 @@ set CP=%JAVA_HOME%\jre\lib\jfxrt.jar;%IGNITE_HOME%\bin\include\schema-import\*
 ::
 if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms256m -Xmx1g
 
-"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% -cp "%CP%" org.apache.ignite.schema.ui.SchemaImportApp
+"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% -cp "%CP%" org.apache.ignite.schema.ui.SchemaImportApp
%*
 
 :error_finish
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07238aaa/bin/ignite-schema-import.sh
----------------------------------------------------------------------
diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh
index 2ef887c..abc8dfa 100644
--- a/bin/ignite-schema-import.sh
+++ b/bin/ignite-schema-import.sh
@@ -70,9 +70,9 @@ fi
 
 case $osname in
     Darwin*)
-        "$JAVA" ${JVM_OPTS} "${DOCK_OPTS}" -cp "${CP}" org.apache.ignite.schema.ui.SchemaImportApp
+        "$JAVA" ${JVM_OPTS} "${DOCK_OPTS}" -cp "${CP}" org.apache.ignite.schema.ui.SchemaImportApp
"$@"
         ;;
    *)
-        "$JAVA" ${JVM_OPTS} -cp "${CP}" org.apache.ignite.schema.ui.SchemaImportApp
+        "$JAVA" ${JVM_OPTS} -cp "${CP}" org.apache.ignite.schema.ui.SchemaImportApp "$@"
         ;;
 esac

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07238aaa/examples/schema-import/db-demo-script.bat
----------------------------------------------------------------------
diff --git a/examples/schema-import/db-demo-script.bat b/examples/schema-import/db-demo-script.bat
deleted file mode 100644
index 7a87a74..0000000
--- a/examples/schema-import/db-demo-script.bat
+++ /dev/null
@@ -1,99 +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.
-::
-
-::
-:: Starts H2 database for Ignite Schema Import demo.
-::
-
-@echo off
-
-if "%OS%" == "Windows_NT"  setlocal
-
-:: Check JAVA_HOME.
-if not "%JAVA_HOME%" == "" goto checkJdk
-    echo %0, ERROR: JAVA_HOME environment variable is not found.
-    echo %0, ERROR: Please create JAVA_HOME variable pointing to location of JDK 1.7 or JDK
1.8.
-    echo %0, ERROR: You can also download latest JDK at: http://java.sun.com/getjava
-goto error_finish
-
-:checkJdk
-:: Check that JDK is where it should be.
-if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
-    echo %0, ERROR: The JDK is not found in %JAVA_HOME%.
-    echo %0, ERROR: Please modify your script so that JAVA_HOME would point to valid location
of JDK.
-goto error_finish
-
-:checkJdkVersion
-"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr "1\.[78]\." > nul
-if %ERRORLEVEL% equ 0 goto checkIgniteHome1
-    echo %0, ERROR: The version of JAVA installed in %JAVA_HOME% is incorrect.
-    echo %0, ERROR: Please install JDK 1.7 or 1.8.
-    echo %0, ERROR: You can also download latest JDK at: http://java.sun.com/getjava
-goto error_finish
-
-:: Check IGNITE_HOME.
-:checkIgniteHome1
-if not "%IGNITE_HOME%" == "" goto checkIgniteHome2
-    pushd "%~dp0"/../..
-    set IGNITE_HOME=%CD%
-    popd
-
-:checkIgniteHome2
-:: Strip double quotes from IGNITE_HOME
-set IGNITE_HOME=%IGNITE_HOME:"=%
-
-:: remove all trailing slashes from IGNITE_HOME.
-if %IGNITE_HOME:~-1,1% == \ goto removeTrailingSlash
-if %IGNITE_HOME:~-1,1% == / goto removeTrailingSlash
-goto checkIgniteHome3
-
-:removeTrailingSlash
-set IGNITE_HOME=%IGNITE_HOME:~0,-1%
-goto checkIgniteHome2
-
-:checkIgniteHome3
-if exist "%IGNITE_HOME%\config" goto checkIgniteHome4
-    echo %0, ERROR: Ignite installation folder is not found or IGNITE_HOME environment variable
is not valid.
-    echo Please create IGNITE_HOME environment variable pointing to location of
-    echo Ignite installation folder.
-    goto error_finish
-
-:checkIgniteHome4
-
-::
-:: Set SCRIPTS_HOME - base path to scripts.
-::
-set SCRIPTS_HOME=%IGNITE_HOME%\bin
-
-:: Remove trailing spaces
-for /l %%a in (1,1,31) do if /i "%SCRIPTS_HOME:~-1%" == " " set SCRIPTS_HOME=%SCRIPTS_HOME:~0,-1%
-
-:run
-
-::
-:: Set IGNITE_LIBS
-::
-call "%SCRIPTS_HOME%\include\setenv.bat"
-
-::
-:: Starts Visor console.
-::
-"%JAVA_HOME%\bin\java.exe" -cp "%IGNITE_LIBS%" org.h2.tools.RunScript -url jdbc:h2:tcp://localhost/demo
-script demo.sql
-
-:error_finish
-
-exit
\ No newline at end of file


Mime
View raw message