github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-07 14:22:13 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-590. Switch Sqoop 2 to Apache Tomcat 6 For Better Integration With Apache Bigtop.

Browse Source 
(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:
Jarek Jarcec Cecho 2012-09-01 05:48:00 +00:00
parent 50e8622caf
commit c8417af9f7
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/pom.xml vendored
View File

@ -21,6 +21,13 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion> <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> <parent>
<groupId>org.apache</groupId> <groupId>org.apache</groupId>
<artifactId>sqoop</artifactId> <artifactId>sqoop</artifactId>
@ -72,10 +79,10 @@ limitations under the License.
<mkdir dir="target/sqoop-${project.version}"/> <mkdir dir="target/sqoop-${project.version}"/>
<!-- server --> <!-- 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"/> dest="target/apache-tomcat.tar.gz" verbose="true" skipexisting="true"/>
<untar src="target/apache-tomcat.tar.gz" dest="target" compression="gzip"/> <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"> <copy todir="target/sqoop-${project.version}/server/bin">
<fileset dir="src/main/server/bin"/> <fileset dir="src/main/server/bin"/>
</copy> </copy>

7
dist/src/main/bin/sqoop.sh vendored
View File

@ -34,6 +34,9 @@ CUR_DIR=`cd $(dirname $(which $0))/..; pwd`
cd ${CUR_DIR} cd ${CUR_DIR}
echo "Sqoop home directory: ${CUR_DIR}..." echo "Sqoop home directory: ${CUR_DIR}..."
CATALINA_BIN=${CATALINA_BIN:-server/bin}
CLIENT_LIB=${CLIENT_LIB:-client/lib}
COMMAND=$1 COMMAND=$1
case $COMMAND in case $COMMAND in
server) server)
@ -42,12 +45,12 @@ case $COMMAND in
exit exit
fi fi
server/bin/catalina.sh $2 $CATALINA_BIN/catalina.sh $2
;; ;;
client) client)
# Build class path with full path to each library # 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`; CLASSPATH=${CLASSPATH}:`readlink -f $f`;
done done