You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2012/09/01 07:48:01 UTC
svn commit: r1379694 - in /sqoop/branches/sqoop2/dist: pom.xml
src/main/bin/sqoop.sh
Author: jarcec
Date: Sat Sep 1 05:48:00 2012
New Revision: 1379694
URL: http://svn.apache.org/viewvc?rev=1379694&view=rev
Log:
SQOOP-590. Switch Sqoop 2 to Apache Tomcat 6 For Better Integration With Apache Bigtop.
(Sean Mackrory via Jarek Jarcec Cecho)
Modified:
sqoop/branches/sqoop2/dist/pom.xml
sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh
Modified: sqoop/branches/sqoop2/dist/pom.xml
URL: http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/pom.xml?rev=1379694&r1=1379693&r2=1379694&view=diff
==============================================================================
--- sqoop/branches/sqoop2/dist/pom.xml (original)
+++ sqoop/branches/sqoop2/dist/pom.xml Sat Sep 1 05:48:00 2012
@@ -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>
Modified: sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh
URL: http://svn.apache.org/viewvc/sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh?rev=1379694&r1=1379693&r2=1379694&view=diff
==============================================================================
--- sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh (original)
+++ sqoop/branches/sqoop2/dist/src/main/bin/sqoop.sh Sat Sep 1 05:48:00 2012
@@ -34,6 +34,9 @@ CUR_DIR=`cd $(dirname $(which $0))/..; p
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