Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BF7B187CC for ; Wed, 13 May 2015 07:32:38 +0000 (UTC) Received: (qmail 83425 invoked by uid 500); 13 May 2015 07:32:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 83401 invoked by uid 500); 13 May 2015 07:32:38 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 83390 invoked by uid 99); 13 May 2015 07:32:38 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 07:32:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id B4B26182369 for ; Wed, 13 May 2015 07:32:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 4hKEXfVkLr_0 for ; Wed, 13 May 2015 07:32:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 56D6A277C2 for ; Wed, 13 May 2015 07:32:20 +0000 (UTC) Received: (qmail 78881 invoked by uid 99); 13 May 2015 07:32:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 07:32:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E63ECE0329; Wed, 13 May 2015 07:32:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 13 May 2015 07:32:19 -0000 Message-Id: <0d6128fb65564562a3ae316526dee85f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/9] incubator-ignite git commit: ignite source-pack fix Repository: incubator-ignite Updated Branches: refs/heads/ignite-484 7000722cf -> 9d96fbcf2 ignite source-pack fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7da0df9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7da0df9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7da0df9d Branch: refs/heads/ignite-484 Commit: 7da0df9dffca55e4153bbdcfc02bb0c2fb417989 Parents: ecc7a50 Author: avinogradov Authored: Tue May 12 13:56:02 2015 +0300 Committer: avinogradov Committed: Tue May 12 13:56:02 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 4 +- bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/build-classpath.bat | 46 +++++++++++++++++++++++ bin/include/build-classpath.sh | 71 +++++++++++++++++++++++++++++++++++ bin/include/target-classpath.bat | 46 ----------------------- bin/include/target-classpath.sh | 71 ----------------------------------- pom.xml | 4 +- 12 files changed, 127 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/assembly/release-base.xml ---------------------------------------------------------------------- diff --git a/assembly/release-base.xml b/assembly/release-base.xml index 6d6465e..88f1d10 100644 --- a/assembly/release-base.xml +++ b/assembly/release-base.xml @@ -71,7 +71,7 @@ **/*hadoop*.bat igniterouter.bat - **/target-classpath.bat + **/build-classpath.bat ignitevisorcmd.bat ignite-schema-import.bat @@ -87,7 +87,7 @@ **/*hadoop*.sh igniterouter.sh - **/target-classpath.sh + **/build-classpath.sh **/service.sh ignitevisorcmd.sh ignite-schema-import.sh http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite-schema-import.bat ---------------------------------------------------------------------- diff --git a/bin/ignite-schema-import.bat b/bin/ignite-schema-import.bat index 4731105..d48234c 100644 --- a/bin/ignite-schema-import.bat +++ b/bin/ignite-schema-import.bat @@ -91,7 +91,7 @@ if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run :: Set IGNITE_LIBS :: call "%SCRIPTS_HOME%\include\setenv.bat" -call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release. +call "%SCRIPTS_HOME%\include\build-classpath.bat" &:: Will be removed in release. set CP=%JAVA_HOME%\jre\lib\jfxrt.jar;%IGNITE_HOME%\bin\include\schema-import\*;%IGNITE_LIBS% :: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite-schema-import.sh ---------------------------------------------------------------------- diff --git a/bin/ignite-schema-import.sh b/bin/ignite-schema-import.sh index 0a70d54..8f2a8d5 100755 --- a/bin/ignite-schema-import.sh +++ b/bin/ignite-schema-import.sh @@ -57,7 +57,7 @@ setIgniteHome # Set IGNITE_LIBS. # . "${SCRIPTS_HOME}"/include/setenv.sh -. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release. +. "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in release. CP="${JAVA_HOME}/jre/lib/jfxrt.jar${SEP}${IGNITE_HOME}/bin/include/schema-import/*${SEP}${IGNITE_LIBS}" # http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite.bat ---------------------------------------------------------------------- diff --git a/bin/ignite.bat b/bin/ignite.bat index 687db60..20836c0 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -102,7 +102,7 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0% :: Set IGNITE_LIBS :: call "%SCRIPTS_HOME%\include\setenv.bat" -call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release. +call "%SCRIPTS_HOME%\include\build-classpath.bat" &:: Will be removed in release. set CP=%IGNITE_LIBS% :: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignite.sh ---------------------------------------------------------------------- diff --git a/bin/ignite.sh b/bin/ignite.sh index a246613..ee92d27 100755 --- a/bin/ignite.sh +++ b/bin/ignite.sh @@ -58,7 +58,7 @@ fi # Set IGNITE_LIBS. # . "${SCRIPTS_HOME}"/include/setenv.sh -. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release. +. "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in release. CP="${IGNITE_LIBS}" RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignitevisorcmd.bat ---------------------------------------------------------------------- diff --git a/bin/ignitevisorcmd.bat b/bin/ignitevisorcmd.bat index 1cf2b26..fe06530 100644 --- a/bin/ignitevisorcmd.bat +++ b/bin/ignitevisorcmd.bat @@ -100,7 +100,7 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0% :: Set IGNITE_LIBS :: call "%SCRIPTS_HOME%\include\setenv.bat" -call "%SCRIPTS_HOME%\include\target-classpath.bat" &:: Will be removed in release. +call "%SCRIPTS_HOME%\include\build-classpath.bat" &:: Will be removed in release. set CP=%IGNITE_HOME%\bin\include\visor-common\*;%IGNITE_HOME%\bin\include\visorcmd\*;%IGNITE_LIBS% :: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/ignitevisorcmd.sh ---------------------------------------------------------------------- diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh index 6118560..91d6c5a 100755 --- a/bin/ignitevisorcmd.sh +++ b/bin/ignitevisorcmd.sh @@ -53,7 +53,7 @@ setIgniteHome # Set IGNITE_LIBS. # . "${SCRIPTS_HOME}"/include/setenv.sh -. "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release. +. "${SCRIPTS_HOME}"/include/build-classpath.sh # Will be removed in release. CP="${IGNITE_HOME}/bin/include/visor-common/*${SEP}${IGNITE_HOME}/bin/include/visorcmd/*${SEP}${IGNITE_LIBS}" # http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/build-classpath.bat ---------------------------------------------------------------------- diff --git a/bin/include/build-classpath.bat b/bin/include/build-classpath.bat new file mode 100644 index 0000000..5f932d3 --- /dev/null +++ b/bin/include/build-classpath.bat @@ -0,0 +1,46 @@ +:: +:: 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. +:: + +:: Target class path resolver. +:: +:: Can be used like: +:: call "%IGNITE_HOME%\bin\include\build-classpath.bat" +:: in other scripts to set classpath using libs from target folder. +:: +:: Will be excluded in release. + +@echo off + +for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F + +for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath %%F + +goto :eof + +:includeToClassPath +if exist "%1\target\" ( + if exist "%1\target\classes\" call :concat %1\target\classes + + if exist "%1\target\test-classes\" call :concat %1\target\test-classes + + if exist "%1\target\libs\" call :concat %1\target\libs\* +) +goto :eof + +:concat +set IGNITE_LIBS=%IGNITE_LIBS%;%1 +goto :eof http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/build-classpath.sh ---------------------------------------------------------------------- diff --git a/bin/include/build-classpath.sh b/bin/include/build-classpath.sh new file mode 100644 index 0000000..9f0c878 --- /dev/null +++ b/bin/include/build-classpath.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# 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. +# + +# Target class path resolver. +# +# Can be used like: +# . "${IGNITE_HOME}"/bin/include/build-classpath.sh +# in other scripts to set classpath using libs from target folder. +# +# Will be excluded in release. + + +# +# OS specific support. +# +SEP=":"; + +case "`uname`" in + MINGW*) + SEP=";"; + export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'` + ;; + CYGWIN*) + SEP=";"; + export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'` + ;; +esac + +includeToClassPath() { + for file in $1/* + do + if [ -d ${file} ] && [ -d "${file}/target" ]; then + if [ -d "${file}/target/classes" ]; then + IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes + fi + + if [ -d "${file}/target/test-classes" ]; then + IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/test-classes + fi + + if [ -d "${file}/target/libs" ]; then + IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/* + fi + fi + done +} + +# +# Include target libraries for enterprise modules to classpath. +# +includeToClassPath modules + +# +# Include target libraries for opensourse modules to classpath. +# +includeToClassPath ${IGNITE_HOME}/modules http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/target-classpath.bat ---------------------------------------------------------------------- diff --git a/bin/include/target-classpath.bat b/bin/include/target-classpath.bat deleted file mode 100644 index 4416557..0000000 --- a/bin/include/target-classpath.bat +++ /dev/null @@ -1,46 +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. -:: - -:: Target class path resolver. -:: -:: Can be used like: -:: call "%IGNITE_HOME%\bin\include\target-classpath.bat" -:: in other scripts to set classpath using libs from target folder. -:: -:: Will be excluded in release. - -@echo off - -for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F - -for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath %%F - -goto :eof - -:includeToClassPath -if exist "%1\target\" ( - if exist "%1\target\classes\" call :concat %1\target\classes - - if exist "%1\target\test-classes\" call :concat %1\target\test-classes - - if exist "%1\target\libs\" call :concat %1\target\libs\* -) -goto :eof - -:concat -set IGNITE_LIBS=%IGNITE_LIBS%;%1 -goto :eof http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/bin/include/target-classpath.sh ---------------------------------------------------------------------- diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh deleted file mode 100644 index 871d517..0000000 --- a/bin/include/target-classpath.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# 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. -# - -# Target class path resolver. -# -# Can be used like: -# . "${IGNITE_HOME}"/bin/include/target-classpath.sh -# in other scripts to set classpath using libs from target folder. -# -# Will be excluded in release. - - -# -# OS specific support. -# -SEP=":"; - -case "`uname`" in - MINGW*) - SEP=";"; - export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'` - ;; - CYGWIN*) - SEP=";"; - export IGNITE_HOME=`echo $IGNITE_HOME | sed -e 's/^\/\([a-zA-Z]\)/\1:/'` - ;; -esac - -includeToClassPath() { - for file in $1/* - do - if [ -d ${file} ] && [ -d "${file}/target" ]; then - if [ -d "${file}/target/classes" ]; then - IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes - fi - - if [ -d "${file}/target/test-classes" ]; then - IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/test-classes - fi - - if [ -d "${file}/target/libs" ]; then - IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/* - fi - fi - done -} - -# -# Include target libraries for enterprise modules to classpath. -# -includeToClassPath modules - -# -# Include target libraries for opensourse modules to classpath. -# -includeToClassPath ${IGNITE_HOME}/modules http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7da0df9d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c445fd3..1b44d5e 100644 --- a/pom.xml +++ b/pom.xml @@ -275,7 +275,7 @@ - + @@ -283,7 +283,7 @@ - +