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

SQOOP-722 Improve Sqoop 2 packaging

Browse Source 
(Jarek Jarcec Cecho)
This commit is contained in:
Bilung Lee 2012-12-04 18:43:15 -08:00
parent a633fb0b34
commit e9868cb72e
2 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dist/pom.xml vendored
View File

@ -125,15 +125,15 @@ limitations under the License.
<configuration> <configuration>
<target> <target>
<!-- Clean up --> <!-- Clean up -->
<delete dir="target/sqoop-${project.version}-bin"/> <delete dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}"/>
<delete file="target/sqoop-${project.version}-bin.tar.gz"/> <delete file="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}.tar.gz"/>
<!-- Create dist dir --> <!-- Create dist dir -->
<mkdir dir="target/sqoop-${project.version}-bin"/> <mkdir dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}"/>
<!-- Copy sources over --> <!-- Copy sources over -->
<copy todir="target/sqoop-${project.version}-bin" includeEmptyDirs="false" flatten="false"> <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}" includeEmptyDirs="false" flatten="false">
<fileset dir="../"> <fileset dir="../">
<include name="**/*" /> <include name="**/*" />
<exclude name="build/**" /> <exclude name="build/**" />
@ -149,38 +149,38 @@ limitations under the License.
<get src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.majorVersion}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.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-${tomcat.version}" tofile="target/sqoop-${project.version}-bin/server"/> <move file="target/apache-tomcat-${tomcat.version}" tofile="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server"/>
<copy todir="target/sqoop-${project.version}-bin/server/bin"> <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/bin">
<fileset dir="src/main/server/bin"/> <fileset dir="src/main/server/bin"/>
</copy> </copy>
<chmod dir="target/sqoop-${project.version}-bin/server/bin" perm="u+x" includes="**/*.sh"/> <chmod dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/bin" perm="u+x" includes="**/*.sh"/>
<copy todir="target/sqoop-${project.version}-bin/server/conf"> <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/conf">
<fileset dir="src/main/server/conf"/> <fileset dir="src/main/server/conf"/>
</copy> </copy>
<delete dir="target/sqoop-${project.version}-bin/server/webapps"/> <delete dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps"/>
<mkdir dir="target/sqoop-${project.version}-bin/server/webapps"/> <mkdir dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps"/>
<copy todir="target/sqoop-${project.version}-bin/server/webapps"> <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps">
<fileset dir="src/main/server/webapps"/> <fileset dir="src/main/server/webapps"/>
</copy> </copy>
<copy file="../server/target/sqoop.war" <copy file="../server/target/sqoop.war"
toDir="target/sqoop-${project.version}-bin/server/webapps"/> toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/server/webapps"/>
<!-- Build client directory --> <!-- Build client directory -->
<copy todir="target/sqoop-${project.version}-bin/client/lib"> <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/client/lib">
<fileset dir="../client/target/lib"/> <fileset dir="../client/target/lib"/>
</copy> </copy>
<copy file="../client/target/sqoop-client-${project.version}.jar" <copy file="../client/target/sqoop-client-${project.version}.jar"
toDir="target/sqoop-${project.version}-bin/client/lib"/> toDir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/client/lib"/>
<!-- Build "bin" directory --> <!-- Build "bin" directory -->
<copy todir="target/sqoop-${project.version}-bin/bin"> <copy todir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/bin">
<fileset dir="src/main/bin"/> <fileset dir="src/main/bin"/>
</copy> </copy>
<chmod dir="target/sqoop-${project.version}-bin/bin" perm="u+x" includes="**/*.sh"/> <chmod dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}/bin" perm="u+x" includes="**/*.sh"/>
<!-- Finally create distribution tar --> <!-- Finally create distribution tar -->
<tar destfile="target/sqoop-${project.version}-bin.tar.gz" compression="gzip"> <tar destfile="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}.tar.gz" compression="gzip">
<tarfileset dir="target/sqoop-${project.version}-bin" prefix="sqoop-${project.version}"/> <tarfileset dir="target/sqoop-${project.version}-bin-hadoop${hadoop.profile}" prefix="sqoop-${project.version}-bin-hadoop${hadoop.profile}"/>
</tar> </tar>
</target> </target>
</configuration> </configuration>
@ -190,5 +190,36 @@ limitations under the License.
</plugins> </plugins>
</build> </build>
</profile> </profile>
<!-- Hadoop 1.x -->
<profile>
<id>hadoop100</id>
<activation>
<property>
<name>hadoop.profile</name>
<value>100</value>
</property>
</activation>
</profile>
<!-- Hadoop 2.x (active by default) -->
<profile>
<id>hadoop200</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>hadoop.profile</name>
<value>200</value>
</property>
</activation>
<properties>
<hadoop.profile>200</hadoop.profile>
</properties>
</profile>
</profiles> </profiles>
</project> </project>

2
execution/mapreduce/src/main/java/org/apache/sqoop/job/etl/HdfsExportPartitioner.java
View File

@ -68,7 +68,7 @@ public class HdfsExportPartitioner extends Partitioner {
@Override @Override
public List<Partition> getPartitions(ImmutableContext context, public List<Partition> getPartitions(ImmutableContext context,
Object connectionConfiguration, Object jobConfiguration) { long maxPartitions, Object connectionConfiguration, Object jobConfiguration) {
Configuration conf = ((PrefixContext)context).getConfiguration(); Configuration conf = ((PrefixContext)context).getConfiguration();
try { try {