You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/06 21:26:37 UTC
[30/31] incubator-trafodion git commit: Merge remote branch
'origin/master' into sandhya_copyright2
Merge remote branch 'origin/master' into sandhya_copyright2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/427e2ceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/427e2ceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/427e2ceb
Branch: refs/heads/master
Commit: 427e2ceb8e02553cb0511fac42d6a24cbddb369b
Parents: 09f19da 64e0856
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Tue Oct 6 04:14:25 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Tue Oct 6 04:14:25 2015 +0000
----------------------------------------------------------------------
Makefile | 52 +++++++++++++++++++--------
core/conn/trafci/.gitignore | 1 +
core/conn/trafci/build.xml | 22 ++++++++++--
core/conn/trafci/utils/trafci.cmd | 52 ---------------------------
core/conn/trafci/utils/trafci.cmd-tmpl | 54 +++++++++++++++++++++++++++++
core/rest/Makefile | 2 +-
core/sqf/Makefile | 7 +++-
core/sql/regress/executor/EXPECTED130 | 38 ++++++++++----------
core/sql/regress/executor/TEST130 | 24 ++++++-------
dcs/Makefile | 2 +-
10 files changed, 151 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/427e2ceb/core/conn/trafci/utils/trafci.cmd-tmpl
----------------------------------------------------------------------
diff --cc core/conn/trafci/utils/trafci.cmd-tmpl
index 0000000,578135f..aa195a6
mode 000000,100644..100644
--- a/core/conn/trafci/utils/trafci.cmd-tmpl
+++ b/core/conn/trafci/utils/trafci.cmd-tmpl
@@@ -1,0 -1,34 +1,54 @@@
+ @echo off&Title Trafodion Command Interface
++REM @@@ START COPYRIGHT @@@
++REM
++REM Licensed to the Apache Software Foundation (ASF) under one
++REM or more contributor license agreements. See the NOTICE file
++REM distributed with this work for additional information
++REM regarding copyright ownership. The ASF licenses this file
++REM to you under the Apache License, Version 2.0 (the
++REM "License"); you may not use this file except in compliance
++REM with the License. You may obtain a copy of the License at
++REM
++REM http://www.apache.org/licenses/LICENSE-2.0
++REM
++REM Unless required by applicable law or agreed to in writing,
++REM software distributed under the License is distributed on an
++REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++REM KIND, either express or implied. See the License for the
++REM specific language governing permissions and limitations
++REM under the License.
++REM
++REM @@@ END COPYRIGHT @@@
+
+ CLS
+ set MY_SQROOT=
+ set CMD_LINE_ARGS=
+ set TRAFODION_VER_PROD=@prodver@
+ set PRODUCT_COPYRIGHT_HEADER=@copyrighthdr@
+ set TRAFCI_QUERY_STRING=
+ set TRAFCI_CLASSPATH="##TRAFCI_CLASSPATH##"
+ set ROLE_ARGS=-r ""
+ set count=0
+
+ :set_args_loop
+
+ set /a count+=1
+ set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+ shift /1
+ if %count%==16 goto after_set_args_loop
+
+ goto set_args_loop
+
+ :after_set_args_loop
+ set binlocation=%~dp0
+ set driver=%binlocation:~0,2%
+ %driver%
+ cd %binlocation%
+ java -classpath %TRAFCI_CLASSPATH% org.trafodion.ci.UserInterface %CMD_LINE_ARGS%
+
+ if not %ERRORLEVEL% EQU -9999 goto end_loop
+ echo.
+ echo Press any key to close this session
+ pause > nul
+
+ :end_loop