Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-6404. Rename the generated artifacts to common instead of core. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@949032 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2010-05-27 22:46:48 +00:00
parent 24a2f1fafe
commit 9dd25df80e
9 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1592,6 +1592,9 @@ Release 0.21.0 - Unreleased
HADOOP-6723. Unchecked exceptions thrown in IPC Connection should not HADOOP-6723. Unchecked exceptions thrown in IPC Connection should not
orphan clients. (Todd Lipcon via tomwhite) orphan clients. (Todd Lipcon via tomwhite)
HADOOP-6404. Rename the generated artifacts to common instead of core.
(tomwhite)
Release 0.20.3 - Unreleased Release 0.20.3 - Unreleased
NEW FEATURES NEW FEATURES

89
build.xml
View File

@ -17,7 +17,7 @@
limitations under the License. limitations under the License.
--> -->
<project name="Hadoop-Core" default="compile" <project name="Hadoop-Common" default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:artifact="urn:maven-artifact-ant"> xmlns:artifact="urn:maven-artifact-ant">
@ -26,8 +26,8 @@
<property file="${user.home}/build.properties" /> <property file="${user.home}/build.properties" />
<property file="${basedir}/build.properties" /> <property file="${basedir}/build.properties" />
<property name="Name" value="Hadoop-core"/> <property name="Name" value="Hadoop-common"/>
<property name="name" value="hadoop-core"/> <property name="name" value="hadoop-common"/>
<property name="version" value="0.22.0-SNAPSHOT"/> <property name="version" value="0.22.0-SNAPSHOT"/>
<property name="final.name" value="${name}-${version}"/> <property name="final.name" value="${name}-${version}"/>
<property name="test.final.name" value="${name}-test-${version}"/> <property name="test.final.name" value="${name}-test-${version}"/>
@ -149,21 +149,21 @@
<property name="build.ivy.report.dir" location="${build.ivy.dir}/report"/> <property name="build.ivy.report.dir" location="${build.ivy.dir}/report"/>
<property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven"/> <property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven"/>
<property name="pom.xml" location="${build.ivy.maven.dir}/pom.xml"/> <property name="pom.xml" location="${build.ivy.maven.dir}/pom.xml"/>
<property name="hadoop-core.pom" location="${ivy.dir}/hadoop-core.xml"/> <property name="hadoop-common.pom" location="${ivy.dir}/hadoop-common.xml"/>
<property name="build.ivy.maven.core.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar"/> <property name="build.ivy.maven.common.jar" location="${build.ivy.maven.dir}/hadoop-common-${version}.jar"/>
<property name="hadoop-core-test.pom" location="${ivy.dir}/hadoop-core-test.xml" /> <property name="hadoop-common-test.pom" location="${ivy.dir}/hadoop-common-test.xml" />
<property name="build.ivy.maven.core-test.jar" location="${build.ivy.maven.dir}/hadoop-core-test-${version}.jar"/> <property name="build.ivy.maven.common-test.jar" location="${build.ivy.maven.dir}/hadoop-common-test-${version}.jar"/>
<!--this is the naming policy for artifacts we want pulled down--> <!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.module" location="hadoop-core" /> <property name="ivy.module" location="hadoop-common" />
<property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/> <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
<!--this is how artifacts that get built are named--> <!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="[artifact]-[revision].[ext]"/> <property name="ivy.publish.pattern" value="[artifact]-[revision].[ext]"/>
<property name="hadoop-core.jar" location="${build.dir}/${final.name}.jar" /> <property name="hadoop-common.jar" location="${build.dir}/${final.name}.jar" />
<property name="hadoop-core-test.jar" location="${build.dir}/${test.final.name}.jar" /> <property name="hadoop-common-test.jar" location="${build.dir}/${test.final.name}.jar" />
<property name="hadoop-core-sources.jar" location="${build.dir}/${final.name}-sources.jar" /> <property name="hadoop-common-sources.jar" location="${build.dir}/${final.name}-sources.jar" />
<property name="hadoop-core-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" /> <property name="hadoop-common-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" />
<!-- jdiff.home property set --> <!-- jdiff.home property set -->
<property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/> <property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
@ -406,11 +406,11 @@
</target> </target>
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- Make hadoop-core.jar --> <!-- Make hadoop-common.jar -->
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="jar" depends="compile-core" description="Make hadoop-core.jar"> <target name="jar" depends="compile-core" description="Make hadoop-common.jar">
<tar compression="gzip" destfile="${build.classes}/bin.tgz"> <tar compression="gzip" destfile="${build.classes}/bin.tgz">
<tarfileset dir="bin" mode="755"/> <tarfileset dir="bin" mode="755"/>
</tar> </tar>
@ -428,7 +428,7 @@
<fileset file="${jar.extra.properties.list}" /> <fileset file="${jar.extra.properties.list}" />
</jar> </jar>
<jar jarfile="${hadoop-core-sources.jar}"> <jar jarfile="${hadoop-common-sources.jar}">
<fileset dir="${java.src.dir}" includes="org/apache/hadoop/**/*.java"/> <fileset dir="${java.src.dir}" includes="org/apache/hadoop/**/*.java"/>
<fileset dir="${build.src}" includes="org/apache/hadoop/**/*.java"/> <fileset dir="${build.src}" includes="org/apache/hadoop/**/*.java"/>
</jar> </jar>
@ -537,7 +537,7 @@
</manifest> </manifest>
</jar> </jar>
<jar jarfile="${hadoop-core-test-sources.jar}"> <jar jarfile="${hadoop-common-test-sources.jar}">
<fileset dir="${test.generated.dir}" includes="org/apache/hadoop/**/*.java"/> <fileset dir="${test.generated.dir}" includes="org/apache/hadoop/**/*.java"/>
<fileset dir="${test.src.dir}/core" includes="org/apache/hadoop/**/*.java"/> <fileset dir="${test.src.dir}/core" includes="org/apache/hadoop/**/*.java"/>
</jar> </jar>
@ -1202,55 +1202,54 @@
classpathref="mvn-ant-task.classpath"/> classpathref="mvn-ant-task.classpath"/>
</target> </target>
<target name="mvn-install" depends="mvn-taskdef,jar,jar-test, <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version,-mvn-system-install"
-mvn-system-install,set-version" description="To install hadoop common and test jars to local filesystem's m2 cache">
description="To install hadoop core and test jars to local filesystem's m2 cache"> <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
<artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/> <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
<artifact:pom file="${hadoop-core-test.pom}" id="hadoop.core.test"/> <artifact:install file="${hadoop-common.jar}">
<artifact:install file="${hadoop-core.jar}">
<pom refid="hadoop.core"/> <pom refid="hadoop.core"/>
<attach file="${hadoop-core-sources.jar}" classifier="sources" /> <attach file="${hadoop-common-sources.jar}" classifier="sources" />
</artifact:install> </artifact:install>
<artifact:install file="${hadoop-core-test.jar}"> <artifact:install file="${hadoop-common-test.jar}">
<pom refid="hadoop.core.test"/> <pom refid="hadoop.core.test"/>
<attach file="${hadoop-core-test-sources.jar}" classifier="sources" /> <attach file="${hadoop-common-test-sources.jar}" classifier="sources" />
</artifact:install> </artifact:install>
</target> </target>
<target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test, set-version, <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test, set-version,
-mvn-system-deploy" -mvn-system-deploy"
description="To deploy hadoop core and test jar's to apache snapshot's repository"> description="To deploy hadoop common and test jar's to apache snapshot's repository">
<artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/> <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
<artifact:pom file="${hadoop-core-test.pom}" id="hadoop.core.test"/> <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
<artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/> <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
<artifact:deploy file="${hadoop-core.jar}"> <artifact:deploy file="${hadoop-common.jar}">
<remoteRepository id="apache.snapshots.https" url="${asfrepo}"/> <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
<pom refid="hadoop.core"/> <pom refid="hadoop.core"/>
<attach file="${hadoop-core-sources.jar}" classifier="sources" /> <attach file="${hadoop-common-sources.jar}" classifier="sources" />
</artifact:deploy> </artifact:deploy>
<artifact:deploy file="${hadoop-core-test.jar}"> <artifact:deploy file="${hadoop-common-test.jar}">
<remoteRepository id="apache.snapshots.https" url="${asfrepo}"/> <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
<pom refid="hadoop.core.test"/> <pom refid="hadoop.core.test"/>
<attach file="${hadoop-core-test-sources.jar}" classifier="sources" /> <attach file="${hadoop-common-test-sources.jar}" classifier="sources" />
</artifact:deploy> </artifact:deploy>
</target> </target>
<target name="set-version"> <target name="set-version">
<delete file="${basedir}/ivy/hadoop-core.xml"/> <delete file="${basedir}/ivy/hadoop-common.xml"/>
<delete file="${basedir}/ivy/hadoop-core-test.xml"/> <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
<delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/> <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
<copy file="${basedir}/ivy/hadoop-core-template.xml" tofile="${basedir}/ivy/hadoop-core.xml"/> <copy file="${basedir}/ivy/hadoop-common-template.xml" tofile="${basedir}/ivy/hadoop-common.xml"/>
<copy file="${basedir}/ivy/hadoop-core-test-template.xml" tofile="${basedir}/ivy/hadoop-core-test.xml"/> <copy file="${basedir}/ivy/hadoop-common-test-template.xml" tofile="${basedir}/ivy/hadoop-common-test.xml"/>
<copy file="${basedir}/ivy/hadoop-core-${herriot.suffix}-template.xml" <copy file="${basedir}/ivy/hadoop-common-${herriot.suffix}-template.xml"
tofile="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/> tofile="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
<replaceregexp byline="true"> <replaceregexp byline="true">
<regexp pattern="@version"/> <regexp pattern="@version"/>
<substitution expression="${version}"/> <substitution expression="${version}"/>
<fileset dir="${basedir}/ivy"> <fileset dir="${basedir}/ivy">
<include name="hadoop-core.xml"/> <include name="hadoop-common.xml"/>
<include name="hadoop-core-test.xml"/> <include name="hadoop-common-test.xml"/>
<include name="hadoop-core-${herriot.suffix}.xml"/> <include name="hadoop-common-${herriot.suffix}.xml"/>
</fileset> </fileset>
</replaceregexp> </replaceregexp>
</target> </target>
@ -1284,9 +1283,9 @@
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="clean" depends="clean-contrib, clean-fi" description="Clean. Delete the build files, and their directories"> <target name="clean" depends="clean-contrib, clean-fi" description="Clean. Delete the build files, and their directories">
<delete dir="${build.dir}"/> <delete dir="${build.dir}"/>
<delete file="${basedir}/ivy/hadoop-core.xml"/> <delete file="${basedir}/ivy/hadoop-common.xml"/>
<delete file="${basedir}/ivy/hadoop-core-test.xml"/> <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
<delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/> <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
<delete dir="${docs.src}/build"/> <delete dir="${docs.src}/build"/>
<delete dir="${src.docs.cn}/build"/> <delete dir="${src.docs.cn}/build"/>
</target> </target>

2
ivy.xml
View File

@ -20,7 +20,7 @@
<license name="Apache 2.0"/> <license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/> <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
<description> <description>
Hadoop Core Hadoop Common
</description> </description>
</info> </info>
<configurations defaultconfmapping="default"> <configurations defaultconfmapping="default">

2
ivy/hadoop-core-instrumented-template.xml → ivy/hadoop-common-instrumented-template.xml
View File

@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core-instrumented</artifactId> <artifactId>hadoop-common-instrumented</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>@version</version> <version>@version</version>
<dependencies> <dependencies>

2
ivy/hadoop-core-template.xml → ivy/hadoop-common-template.xml
View File

@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId> <artifactId>hadoop-common</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>@version</version> <version>@version</version>
<dependencies> <dependencies>

4
ivy/hadoop-core-test-template.xml → ivy/hadoop-common-test-template.xml
View File

@ -20,13 +20,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core-test</artifactId> <artifactId>hadoop-common-test</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>@version</version> <version>@version</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId> <artifactId>hadoop-common</artifactId>
<version>@version</version> <version>@version</version>
</dependency> </dependency>
<dependency> <dependency>

2
src/docs/cn/src/documentation/skinconf.xml
View File

@ -99,7 +99,7 @@ which will be used to configure the chosen Forrest skin.
<trail> <trail>
<link1 name="Apache" href="http://www.apache.org/"/> <link1 name="Apache" href="http://www.apache.org/"/>
<link2 name="Hadoop" href="http://hadoop.apache.org/"/> <link2 name="Hadoop" href="http://hadoop.apache.org/"/>
<link3 name="Core" href="http://hadoop.apache.org/core/"/> <link3 name="Common" href="http://hadoop.apache.org/common/"/>
</trail> </trail>
<!-- Configure the TOC, i.e. the Table of Contents. <!-- Configure the TOC, i.e. the Table of Contents.

2
src/docs/src/documentation/skinconf.xml
View File

@ -99,7 +99,7 @@ which will be used to configure the chosen Forrest skin.
<trail> <trail>
<link1 name="Apache" href="http://www.apache.org/"/> <link1 name="Apache" href="http://www.apache.org/"/>
<link2 name="Hadoop" href="http://hadoop.apache.org/"/> <link2 name="Hadoop" href="http://hadoop.apache.org/"/>
<link3 name="Core" href="http://hadoop.apache.org/core/"/> <link3 name="Common" href="http://hadoop.apache.org/common/"/>
</trail> </trail>
<!-- Configure the TOC, i.e. the Table of Contents. <!-- Configure the TOC, i.e. the Table of Contents.

22
src/test/aop/build/aop.xml
View File

@ -29,11 +29,11 @@
<!-- Properties specifically for system fault-injections and system tests --> <!-- Properties specifically for system fault-injections and system tests -->
<property name="herriot.suffix" value="instrumented"/> <property name="herriot.suffix" value="instrumented"/>
<property name="hadoop-core-instrumented.pom" <property name="hadoop-common-instrumented.pom"
location="${ivy.dir}/hadoop-core-${herriot.suffix}.xml" /> location="${ivy.dir}/hadoop-common-${herriot.suffix}.xml" />
<property name="hadoop-core-instrumented.jar" <property name="hadoop-common-instrumented.jar"
location="${system-test-build-dir}/${final.name}-${herriot.suffix}.jar" /> location="${system-test-build-dir}/${final.name}-${herriot.suffix}.jar" />
<property name="hadoop-core-instrumented-sources.jar" <property name="hadoop-common-instrumented-sources.jar"
location="${system-test-build-dir}/${final.name}-${herriot.suffix}-sources.jar" /> location="${system-test-build-dir}/${final.name}-${herriot.suffix}-sources.jar" />
<!--All Fault Injection (FI) related targets are located in this session --> <!--All Fault Injection (FI) related targets are located in this session -->
@ -120,7 +120,7 @@
</target> </target>
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create hadoop-{version}-dev-core.jar required to be deployed on --> <!-- Create hadoop-{version}-dev-common.jar required to be deployed on -->
<!-- cluster for system tests --> <!-- cluster for system tests -->
<!-- =============================================================== --> <!-- =============================================================== -->
<target name="jar-system" <target name="jar-system"
@ -252,22 +252,22 @@
<!-- Maven --> <!-- Maven -->
<target name="-mvn-system-install" depends="mvn-taskdef, jar-system"> <target name="-mvn-system-install" depends="mvn-taskdef, jar-system">
<artifact:pom file="${hadoop-core-instrumented.pom}" id="hadoop.core.${herriot.suffix}"/> <artifact:pom file="${hadoop-common-instrumented.pom}" id="hadoop.core.${herriot.suffix}"/>
<artifact:install file="${hadoop-core-instrumented.jar}"> <artifact:install file="${hadoop-common-instrumented.jar}">
<pom refid="hadoop.core.${herriot.suffix}"/> <pom refid="hadoop.core.${herriot.suffix}"/>
<attach file="${hadoop-core-instrumented-sources.jar}" classifier="sources" /> <attach file="${hadoop-common-instrumented-sources.jar}" classifier="sources" />
</artifact:install> </artifact:install>
</target> </target>
<target name="-mvn-system-deploy" depends="mvn-taskdef, jar-system"> <target name="-mvn-system-deploy" depends="mvn-taskdef, jar-system">
<artifact:pom file="${hadoop-core-instrumented.pom}" <artifact:pom file="${hadoop-common-instrumented.pom}"
id="hadoop.core.${herriot.suffix}"/> id="hadoop.core.${herriot.suffix}"/>
<artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/> <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
<artifact:deploy file="${hadoop-core-instrumented.jar}"> <artifact:deploy file="${hadoop-common-instrumented.jar}">
<remoteRepository id="apache.snapshots.https" url="${asfrepo}"/> <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
<pom refid="hadoop.core.${herriot.suffix}"/> <pom refid="hadoop.core.${herriot.suffix}"/>
<attach file="${hadoop-core-instrumented-sources.jar}" classifier="sources"/> <attach file="${hadoop-common-instrumented-sources.jar}" classifier="sources"/>
</artifact:deploy> </artifact:deploy>
</target> </target>
<!-- End of Maven --> <!-- End of Maven -->