You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/02 18:12:25 UTC
[46/60] incubator-trafodion git commit: Additional jdbcT4 changes in
other components
Additional jdbcT4 changes in other components
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3253e723
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3253e723
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3253e723
Branch: refs/heads/master
Commit: 3253e7231f7d01a444643069d2ac7fd7cd1912b2
Parents: a0f21cd
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Apr 22 00:17:06 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Apr 22 00:17:06 2016 +0000
----------------------------------------------------------------------
core/Makefile | 2 +-
core/conn/trafci/build.xml | 4 ++--
core/conn/trafci/utils/trafci_install.sh | 2 +-
core/sqf/sql/scripts/install_traf_components | 8 ++++----
dcs/src/test/jdbc_test/jdbc_test.py | 4 ++--
tests/phx/phoenix_test.py | 5 ++---
6 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3253e723/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 6c4b865..89740c9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -141,7 +141,7 @@ pkg-sql-regress: all
cd sqf && $(MAKE) package-regress 2>&1 | sed -e "s/$$/ ##(Package sql regress)/";exit $${PIPESTATUS[0]}
# Package Phoenix test
-pkg-phx-tests: all
+pkg-phx-tests:
cd sqf && $(MAKE) package-phx 2>&1 | sed -e "s/$$/ ##(Package phoenix)/";exit $${PIPESTATUS[0]}
# Package dcs tests
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3253e723/core/conn/trafci/build.xml
----------------------------------------------------------------------
diff --git a/core/conn/trafci/build.xml b/core/conn/trafci/build.xml
index 62f2b25..50030e2 100644
--- a/core/conn/trafci/build.xml
+++ b/core/conn/trafci/build.xml
@@ -32,9 +32,10 @@
</exec>
<property file="buildId"/>
+ <property environment="my_env"/>
<property name="source.version" value="1.7" />
<property id="base.dir" name="base.dir" value="."/>
- <property name="jdbcT4" value="${base.dir}/../../sqf/export/lib/jdbcT4.jar"/>
+ <property name="jdbcT4" value="${base.dir}/../../sqf/export/lib/jdbcT4-${my_env.TRAFODION_VER}.jar"/>
<property name="platform-install.dir" value="${base.dir}/../../sqf/trafci"/>
<property name="temp.dir" value="${base.dir}/temp"/>
<property name="tempsrc.dir" value="${temp.dir}/src"/>
@@ -64,7 +65,6 @@
<property name="tar.file" value="trafci.tar" />
<property name="installer.zipfile" value="trafci.zip" />
<property name="vproc.version" value="TrafCI_Build_${bldId}"/>
- <property environment="my_env"/>
<target name="ProductVersion">
<echo>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3253e723/core/conn/trafci/utils/trafci_install.sh
----------------------------------------------------------------------
diff --git a/core/conn/trafci/utils/trafci_install.sh b/core/conn/trafci/utils/trafci_install.sh
index 81192f8..76fc152 100644
--- a/core/conn/trafci/utils/trafci_install.sh
+++ b/core/conn/trafci/utils/trafci_install.sh
@@ -39,7 +39,7 @@ EXPORTLIBDIR=$MY_SQROOT/export/lib
CP=/bin/cp
TEMPSRC=../temp
-sed 's/\#\#TRAFCI_CLASSPATH\#\#/\${MY_SQROOT}\/export\/lib\/jdbcT4.jar:\${MY_SQROOT}\/trafci\/lib\/trafci.jar/g' trafci.sh > lnxplatform.sh
+sed 's/\#\#TRAFCI_CLASSPATH\#\#/\${MY_SQROOT}\/export\/lib\/jdbcT4-${TRAFODION_VER}.jar:\${MY_SQROOT}\/trafci\/lib\/trafci.jar/g' trafci.sh > lnxplatform.sh
mv -f lnxplatform.sh $TEMPSRC/trafci.sh
echo "Creating trafci install folder in $MY_SQROOT "
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3253e723/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_traf_components b/core/sqf/sql/scripts/install_traf_components
index a84f026..921de71 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -110,7 +110,7 @@ else
elif [[ -d $DCS_SRC ]]; then
echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
- if [[ -f $MY_SQROOT/export/lib/jdbcT4.jar ]]; then
+ if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build DCS from $DCS_SRC" | tee -a ${MY_LOG_FILE}
cd $DCS_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
@@ -193,7 +193,7 @@ else
elif [[ -d $REST_SRC ]]; then
echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
- if [[ -f $MY_SQROOT/export/lib/jdbcT4.jar ]]; then
+ if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build REST from $REST_SRC" | tee -a ${MY_LOG_FILE}
cd $REST_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
@@ -329,7 +329,7 @@ cd $PHXDIR
if [[ \$1 == "t4" ]]
then
./phoenix_test.py --target=localhost:$MY_DCS_MASTER_PORT --user=dontcare --pw=dontcare \\
- --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$MY_SQROOT/export/lib/jdbcT4.jar
+ --targettype=TR --javahome=\$JAVA_HOME --jdbccp=\$MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar
elif [[ \$1 == "t2" ]]
then
export LD_PRELOAD=\$JAVA_HOME/jre/lib/amd64/libjsig.so:\$MY_SQROOT/export/lib\$SQ_MBTYPE/libseabasesig.so
@@ -494,7 +494,7 @@ else
cd $JDBCTEST_DIR
./jdbc_test.py --appid=jdbc_test --user=SOMEUSER --pw=SOMEPASSWORD --javahome=\$JAVA_HOME \\
--target=localhost:$MY_DCS_MASTER_PORT --dbmaj=\$TRAFODION_VER_MAJOR --dbmin=\$TRAFODION_VER_MINOR \\
- --jdbctype=T4 --jdbccp=\$MY_SQROOT/export/lib/jdbcT4.jar "\$@"
+ --jdbctype=T4 --jdbccp=\$MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar "\$@"
EOF
chmod +x $MY_SQROOT/sql/scripts/swjdbc
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3253e723/dcs/src/test/jdbc_test/jdbc_test.py
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/jdbc_test.py b/dcs/src/test/jdbc_test/jdbc_test.py
index 4835c3d..743f767 100755
--- a/dcs/src/test/jdbc_test/jdbc_test.py
+++ b/dcs/src/test/jdbc_test/jdbc_test.py
@@ -203,7 +203,7 @@ def prog_parse_args():
info = inspect.getframeinfo(frame)
gvars.my_ROOT = os.path.dirname(os.path.abspath(info.filename))
- DEFAULT_JDBC_CLASSPATH = '${project.basedir}/lib/jdbcT4.jar'
+ DEFAULT_JDBC_CLASSPATH = '${project.basedir}/lib/jdbcT4-${TRAFODION_VER}.jar'
DEFAULT_PROP_FILE = os.path.join(gvars.my_ROOT, 'jdbcprop')
# alas, the more powerful argparse module only exists in >= 2.7 and >= 3.2,
@@ -241,7 +241,7 @@ def prog_parse_args():
help='java program (version 1.7 required) location, defaulted to \'/usr\''),
optparse.make_option('', '--jdbccp', action='store', type='string',
dest='jdbccp', default=DEFAULT_JDBC_CLASSPATH,
- help='jdbc classpath, defaulted to \'${project.basedir}/lib/jdbcT4.jar\', <test_root> is where this program is.'),
+ help='jdbc classpath, defaulted to \'${project.basedir}/lib/jdbcT4-${TRAFODION_VER}.jar\', <test_root> is where this program is.'),
optparse.make_option('', '--propfile', action='store', type='string',
dest='propfile', default=DEFAULT_PROP_FILE,
help='property file, defaulted to automatically generated \'<test root>/jdbcprop\', <test root> is where this program is.'),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3253e723/tests/phx/phoenix_test.py
----------------------------------------------------------------------
diff --git a/tests/phx/phoenix_test.py b/tests/phx/phoenix_test.py
index e7a5ff2..d4c288f 100755
--- a/tests/phx/phoenix_test.py
+++ b/tests/phx/phoenix_test.py
@@ -429,9 +429,8 @@ def prog_parse_args():
frame = rec[0]
info = inspect.getframeinfo(frame)
gvars.my_ROOT = os.path.dirname(os.path.abspath(info.filename))
-
DEFAULT_RESULTS_DIR = os.path.join(gvars.my_ROOT, 'results')
- DEFAULT_JDBC_CLASSPATH = '${project.basedir}/lib/jdbcT4.jar'
+ DEFAULT_JDBC_CLASSPATH = '${project.basedir}/lib/jdbcT4-${TRAFODION_VER}.jar'
DEFAULT_PROP_FILE = os.path.join(gvars.my_ROOT, 'jdbcprop')
# alas, the more powerful argparse module only exists in >= 2.7 and >= 3.2,
@@ -469,7 +468,7 @@ def prog_parse_args():
optparse.make_option('', '--jdbccp', action='store', type='string',
dest='jdbccp', default=DEFAULT_JDBC_CLASSPATH,
help="jdbc classpath, defaulted to " +
- "'${project.basedir}/lib/jdbcT4.jar', \t\t "
+ "'${project.basedir}/lib/jdbcT4-${TRAFODION_VER}.jar', \t\t "
"<test_root> is where this program is"),
optparse.make_option('', '--resultdir', action='store', type='string',
dest='resultdir', default=DEFAULT_RESULTS_DIR,