You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sv...@apache.org on 2016/05/17 23:36:20 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1992] Re-packaging
server tar file broke install_traf_components
Repository: incubator-trafodion
Updated Branches:
refs/heads/release2.0 8feea9087 -> 6c7826c62
[TRAFODION-1992] Re-packaging server tar file broke install_traf_components
Change install_traf_components to use built target directory
instead of tar file, now that tar file is not produced for DCS and REST.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/55093a15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/55093a15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/55093a15
Branch: refs/heads/release2.0
Commit: 55093a157338ecef73e038267cb1b9e9d8f4b4f8
Parents: 8feea90
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri May 13 20:34:10 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri May 13 20:34:10 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_traf_components | 50 +++++++++++------------
1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/55093a15/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..9a19f2d 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -39,12 +39,12 @@ REST_SRC=$MY_SQROOT/../rest
PHX_SRC=$MY_SQROOT/../../tests/phx
TRAF_TARS=$MY_SQROOT/../../distribution
-if [ -z "$DCS_TAR" ]; then
- DCS_TAR=$(ls $TRAF_TARS/dcs*tar.gz 2>/dev/null)
+if [ -z "$DCS_BLD" ]; then
+ DCS_BLD=$(ls -d $DCS_SRC/target/dcs-*/dcs-* 2>/dev/null)
fi
-if [ -z "$REST_TAR" ]; then
- REST_TAR=$(ls $TRAF_TARS/rest*tar.gz 2>/dev/null)
+if [ -z "$REST_BLD" ]; then
+ REST_BLD=$(ls -d $REST_SRC/target/rest-*/rest-* 2>/dev/null)
fi
if [ -z "$PHX_TAR" ]; then
@@ -56,7 +56,7 @@ if [ -z "$DCSTEST_TAR" ]; then
fi
if [ -z "$CLIENT_TAR" ]; then
- CLIENT_TAR=$(ls $TRAF_TARS/*clients*.tgz 2>/dev/null)
+ CLIENT_TAR=$(ls $TRAF_TARS/*clients* 2>/dev/null)
fi
if [[ -f $CLIENT_TAR ]]; then
@@ -84,8 +84,8 @@ else
fi
echo " For local hadoop... $MY_SW_ROOT" | tee -a ${MY_LOG_FILE}
-echo " For DCS_TAR... $DCS_TAR" | tee -a ${MY_LOG_FILE}
-echo " For REST_TAR... $REST_TAR" | tee -a ${MY_LOG_FILE}
+echo " For DCS_BLD... $DCS_BLD" | tee -a ${MY_LOG_FILE}
+echo " For REST_BLD... $REST_BLD" | tee -a ${MY_LOG_FILE}
if [[ -f $PHX_TAR ]]; then
echo " For PHX_TAR... $PHX_TAR" | tee -a ${MY_LOG_FILE}
@@ -105,31 +105,31 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d dcs-* ]; then
echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
else
- if [[ -f $DCS_TAR ]]; then
- echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $DCS_BLD ]]; then
+ echo "Using DCS Build: $DCS_BLD" | tee -a ${MY_LOG_FILE}
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}
+ echo "DCS built target was not found in $DCS_SRC" | tee -a ${MY_LOG_FILE}
+ echo "Building DCS" | tee -a ${MY_LOG_FILE}
if [[ -f $MY_SQROOT/export/lib/jdbcT4.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
- mv $DCS_SRC/target/dcs*.gz $TRAF_TARS
cd $MY_SW_ROOT
else
echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. " | tee -a ${MY_LOG_FILE}
echo "Please build the core Trafodion component" | tee -a ${MY_LOG_FILE}
exit 2
fi
+ DCS_BLD=$(ls -d $DCS_SRC/target/dcs-*/dcs-* 2>/dev/null)
fi
- if [[ ! -f $DCS_TAR ]]; then
- echo "**** ERROR: DCS tar file not found. " | tee -a ${MY_LOG_FILE}
+ if [[ ! -d $DCS_BLD ]]; then
+ echo "**** ERROR: DCS built target not found. " | tee -a ${MY_LOG_FILE}
exit 2
fi
# Install DCS
- echo "Installing DCS from: $DCS_TAR" | tee -a ${MY_LOG_FILE}
- tar xzf $DCS_TAR | tee -a ${MY_LOG_FILE}
+ echo "Installing DCS from: $DCS_BLD" | tee -a ${MY_LOG_FILE}
+ cp -r $DCS_BLD $MY_SW_ROOT/$(basename $DCS_BLD)
DCS_HOME=$(/bin/ls -d $MY_SW_ROOT/dcs-*)
# Configure DCS
@@ -188,31 +188,31 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d rest-* ]; then
echo "REST files already exist, skipping REST setup"
else
- if [[ -f $REST_TAR ]]; then
- echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $REST_BLD ]]; then
+ echo "Using REST Build: $REST_BLD" | tee -a ${MY_LOG_FILE}
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}
+ echo "REST built target was not found in $REST_SRC" | tee -a ${MY_LOG_FILE}
+ echo "Building REST" | tee -a ${MY_LOG_FILE}
if [[ -f $MY_SQROOT/export/lib/jdbcT4.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
- mv $REST_SRC/target/rest*.gz $TRAF_TARS
cd $MY_SW_ROOT
else
echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. Please build the core Trafodion components" | tee -a ${MY_LOG_FILE}
exit 2
fi
+ REST_BLD=$(ls -d $REST_SRC/target/rest-*/rest-* 2>/dev/null)
fi
- if [[ ! -f $REST_TAR ]]; then
- echo "**** ERROR: REST tar file not found" | tee -a ${MY_LOG_FILE}
+ if [[ ! -d $REST_BLD ]]; then
+ echo "**** ERROR: REST build target not found" | tee -a ${MY_LOG_FILE}
exit 2
fi
# Install REST
- echo "Installing REST from: $REST_TAR" | tee -a ${MY_LOG_FILE}
- tar xzf $REST_TAR | tee -a ${MY_LOG_FILE}
+ echo "Installing REST from: $REST_BLD" | tee -a ${MY_LOG_FILE}
+ cp -r $REST_BLD $MY_SW_ROOT/$(basename $REST_BLD)
REST_HOME=$(/bin/ls -d $MY_SW_ROOT/rest-*)
# Configure REST
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1992]
Re-packaging server tar file broke install_traf_components
Posted by sv...@apache.org.
Merge [TRAFODION-1992] Re-packaging server tar file broke install_traf_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/6c7826c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6c7826c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6c7826c6
Branch: refs/heads/release2.0
Commit: 6c7826c625e7f4f7eb958c81e7db5a0235c08ae3
Parents: 8feea90 55093a1
Author: Steve Varnau <st...@esgyn.com>
Authored: Tue May 17 23:35:06 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Tue May 17 23:35:06 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_traf_components | 50 +++++++++++------------
1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------