mirror of
https://github.com/apache/sqoop.git
synced 2025-05-06 05:41:30 +08:00
SQOOP-590. Switch Sqoop 2 to Apache Tomcat 6 For Better Integration With Apache Bigtop.
(Sean Mackrory via Jarek Jarcec Cecho) git-svn-id: https://svn.apache.org/repos/asf/sqoop/branches/sqoop2@1379694 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
50e8622caf
commit
c8417af9f7
11
dist/pom.xml
vendored
11
dist/pom.xml
vendored
@ -21,6 +21,13 @@ limitations under the License.
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<properties>
|
||||
<tomcat.majorVersion>6</tomcat.majorVersion>
|
||||
<tomcat.minorVersion>0.35</tomcat.minorVersion>
|
||||
<tomcat.version>${tomcat.majorVersion}.${tomcat.minorVersion}</tomcat.version>
|
||||
</properties>
|
||||
|
||||
|
||||
<parent>
|
||||
<groupId>org.apache</groupId>
|
||||
<artifactId>sqoop</artifactId>
|
||||
@ -72,10 +79,10 @@ limitations under the License.
|
||||
<mkdir dir="target/sqoop-${project.version}"/>
|
||||
|
||||
<!-- server -->
|
||||
<get src="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.tar.gz"
|
||||
<get src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.majorVersion}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz"
|
||||
dest="target/apache-tomcat.tar.gz" verbose="true" skipexisting="true"/>
|
||||
<untar src="target/apache-tomcat.tar.gz" dest="target" compression="gzip"/>
|
||||
<move file="target/apache-tomcat-7.0.27" tofile="target/sqoop-${project.version}/server"/>
|
||||
<move file="target/apache-tomcat-${tomcat.version}" tofile="target/sqoop-${project.version}/server"/>
|
||||
<copy todir="target/sqoop-${project.version}/server/bin">
|
||||
<fileset dir="src/main/server/bin"/>
|
||||
</copy>
|
||||
|
7
dist/src/main/bin/sqoop.sh
vendored
7
dist/src/main/bin/sqoop.sh
vendored
@ -34,6 +34,9 @@ CUR_DIR=`cd $(dirname $(which $0))/..; pwd`
|
||||
cd ${CUR_DIR}
|
||||
echo "Sqoop home directory: ${CUR_DIR}..."
|
||||
|
||||
CATALINA_BIN=${CATALINA_BIN:-server/bin}
|
||||
CLIENT_LIB=${CLIENT_LIB:-client/lib}
|
||||
|
||||
COMMAND=$1
|
||||
case $COMMAND in
|
||||
server)
|
||||
@ -42,12 +45,12 @@ case $COMMAND in
|
||||
exit
|
||||
fi
|
||||
|
||||
server/bin/catalina.sh $2
|
||||
$CATALINA_BIN/catalina.sh $2
|
||||
;;
|
||||
|
||||
client)
|
||||
# Build class path with full path to each library
|
||||
for f in client/lib/*.jar; do
|
||||
for f in $CLIENT_LIB/*.jar; do
|
||||
CLASSPATH=${CLASSPATH}:`readlink -f $f`;
|
||||
done
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user