You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2010/05/28 00:46:49 UTC
svn commit: r949032 - in /hadoop/common/trunk: ./ ivy/
src/docs/cn/src/documentation/ src/docs/src/documentation/
src/test/aop/build/
Author: tomwhite
Date: Thu May 27 22:46:48 2010
New Revision: 949032
URL: http://svn.apache.org/viewvc?rev=949032&view=rev
Log:
HADOOP-6404. Rename the generated artifacts to common instead of core.
Added:
hadoop/common/trunk/ivy/hadoop-common-instrumented-template.xml (with props)
hadoop/common/trunk/ivy/hadoop-common-template.xml (with props)
hadoop/common/trunk/ivy/hadoop-common-test-template.xml (with props)
Removed:
hadoop/common/trunk/ivy/hadoop-core-instrumented-template.xml
hadoop/common/trunk/ivy/hadoop-core-template.xml
hadoop/common/trunk/ivy/hadoop-core-test-template.xml
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml
hadoop/common/trunk/ivy.xml
hadoop/common/trunk/src/docs/cn/src/documentation/skinconf.xml
hadoop/common/trunk/src/docs/src/documentation/skinconf.xml
hadoop/common/trunk/src/test/aop/build/aop.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=949032&r1=949031&r2=949032&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu May 27 22:46:48 2010
@@ -1592,6 +1592,9 @@ Release 0.21.0 - Unreleased
HADOOP-6723. Unchecked exceptions thrown in IPC Connection should not
orphan clients. (Todd Lipcon via tomwhite)
+ HADOOP-6404. Rename the generated artifacts to common instead of core.
+ (tomwhite)
+
Release 0.20.3 - Unreleased
NEW FEATURES
Modified: hadoop/common/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=949032&r1=949031&r2=949032&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Thu May 27 22:46:48 2010
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project name="Hadoop-Core" default="compile"
+<project name="Hadoop-Common" default="compile"
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:artifact="urn:maven-artifact-ant">
@@ -26,8 +26,8 @@
<property file="${user.home}/build.properties" />
<property file="${basedir}/build.properties" />
- <property name="Name" value="Hadoop-core"/>
- <property name="name" value="hadoop-core"/>
+ <property name="Name" value="Hadoop-common"/>
+ <property name="name" value="hadoop-common"/>
<property name="version" value="0.22.0-SNAPSHOT"/>
<property name="final.name" value="${name}-${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.maven.dir" location="${build.ivy.dir}/maven"/>
<property name="pom.xml" location="${build.ivy.maven.dir}/pom.xml"/>
- <property name="hadoop-core.pom" location="${ivy.dir}/hadoop-core.xml"/>
- <property name="build.ivy.maven.core.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar"/>
- <property name="hadoop-core-test.pom" location="${ivy.dir}/hadoop-core-test.xml" />
- <property name="build.ivy.maven.core-test.jar" location="${build.ivy.maven.dir}/hadoop-core-test-${version}.jar"/>
+ <property name="hadoop-common.pom" location="${ivy.dir}/hadoop-common.xml"/>
+ <property name="build.ivy.maven.common.jar" location="${build.ivy.maven.dir}/hadoop-common-${version}.jar"/>
+ <property name="hadoop-common-test.pom" location="${ivy.dir}/hadoop-common-test.xml" />
+ <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-->
- <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]"/>
<!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="[artifact]-[revision].[ext]"/>
- <property name="hadoop-core.jar" location="${build.dir}/${final.name}.jar" />
- <property name="hadoop-core-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-core-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" />
+ <property name="hadoop-common.jar" location="${build.dir}/${final.name}.jar" />
+ <property name="hadoop-common-test.jar" location="${build.dir}/${test.final.name}.jar" />
+ <property name="hadoop-common-sources.jar" location="${build.dir}/${final.name}-sources.jar" />
+ <property name="hadoop-common-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" />
<!-- jdiff.home property set -->
<property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
@@ -406,11 +406,11 @@
</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">
<tarfileset dir="bin" mode="755"/>
</tar>
@@ -428,7 +428,7 @@
<fileset file="${jar.extra.properties.list}" />
</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="${build.src}" includes="org/apache/hadoop/**/*.java"/>
</jar>
@@ -537,7 +537,7 @@
</manifest>
</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.src.dir}/core" includes="org/apache/hadoop/**/*.java"/>
</jar>
@@ -1202,55 +1202,54 @@
classpathref="mvn-ant-task.classpath"/>
</target>
- <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,
- -mvn-system-install,set-version"
- description="To install hadoop core and test jars to local filesystem's m2 cache">
- <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
- <artifact:pom file="${hadoop-core-test.pom}" id="hadoop.core.test"/>
- <artifact:install file="${hadoop-core.jar}">
+ <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version,-mvn-system-install"
+ description="To install hadoop common and test jars to local filesystem's m2 cache">
+ <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
+ <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
+ <artifact:install file="${hadoop-common.jar}">
<pom refid="hadoop.core"/>
- <attach file="${hadoop-core-sources.jar}" classifier="sources" />
+ <attach file="${hadoop-common-sources.jar}" classifier="sources" />
</artifact:install>
- <artifact:install file="${hadoop-core-test.jar}">
+ <artifact:install file="${hadoop-common-test.jar}">
<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>
</target>
<target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test, set-version,
-mvn-system-deploy"
- description="To deploy hadoop core and test jar's to apache snapshot's repository">
- <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
- <artifact:pom file="${hadoop-core-test.pom}" id="hadoop.core.test"/>
+ description="To deploy hadoop common and test jar's to apache snapshot's repository">
+ <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
+ <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
<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}"/>
<pom refid="hadoop.core"/>
- <attach file="${hadoop-core-sources.jar}" classifier="sources" />
+ <attach file="${hadoop-common-sources.jar}" classifier="sources" />
</artifact:deploy>
- <artifact:deploy file="${hadoop-core-test.jar}">
+ <artifact:deploy file="${hadoop-common-test.jar}">
<remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
<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>
</target>
<target name="set-version">
- <delete file="${basedir}/ivy/hadoop-core.xml"/>
- <delete file="${basedir}/ivy/hadoop-core-test.xml"/>
- <delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
- <copy file="${basedir}/ivy/hadoop-core-template.xml" tofile="${basedir}/ivy/hadoop-core.xml"/>
- <copy file="${basedir}/ivy/hadoop-core-test-template.xml" tofile="${basedir}/ivy/hadoop-core-test.xml"/>
- <copy file="${basedir}/ivy/hadoop-core-${herriot.suffix}-template.xml"
- tofile="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
+ <delete file="${basedir}/ivy/hadoop-common.xml"/>
+ <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
+ <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
+ <copy file="${basedir}/ivy/hadoop-common-template.xml" tofile="${basedir}/ivy/hadoop-common.xml"/>
+ <copy file="${basedir}/ivy/hadoop-common-test-template.xml" tofile="${basedir}/ivy/hadoop-common-test.xml"/>
+ <copy file="${basedir}/ivy/hadoop-common-${herriot.suffix}-template.xml"
+ tofile="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
<replaceregexp byline="true">
<regexp pattern="@version"/>
<substitution expression="${version}"/>
<fileset dir="${basedir}/ivy">
- <include name="hadoop-core.xml"/>
- <include name="hadoop-core-test.xml"/>
- <include name="hadoop-core-${herriot.suffix}.xml"/>
+ <include name="hadoop-common.xml"/>
+ <include name="hadoop-common-test.xml"/>
+ <include name="hadoop-common-${herriot.suffix}.xml"/>
</fileset>
</replaceregexp>
</target>
@@ -1284,9 +1283,9 @@
<!-- ================================================================== -->
<target name="clean" depends="clean-contrib, clean-fi" description="Clean. Delete the build files, and their directories">
<delete dir="${build.dir}"/>
- <delete file="${basedir}/ivy/hadoop-core.xml"/>
- <delete file="${basedir}/ivy/hadoop-core-test.xml"/>
- <delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
+ <delete file="${basedir}/ivy/hadoop-common.xml"/>
+ <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
+ <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
<delete dir="${docs.src}/build"/>
<delete dir="${src.docs.cn}/build"/>
</target>
Modified: hadoop/common/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy.xml?rev=949032&r1=949031&r2=949032&view=diff
==============================================================================
--- hadoop/common/trunk/ivy.xml (original)
+++ hadoop/common/trunk/ivy.xml Thu May 27 22:46:48 2010
@@ -20,7 +20,7 @@
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
<description>
- Hadoop Core
+ Hadoop Common
</description>
</info>
<configurations defaultconfmapping="default">
Added: hadoop/common/trunk/ivy/hadoop-common-instrumented-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy/hadoop-common-instrumented-template.xml?rev=949032&view=auto
==============================================================================
--- hadoop/common/trunk/ivy/hadoop-common-instrumented-template.xml (added)
+++ hadoop/common/trunk/ivy/hadoop-common-instrumented-template.xml Thu May 27 22:46:48 2010
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common-instrumented</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ <version>0.52</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: hadoop/common/trunk/ivy/hadoop-common-instrumented-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: hadoop/common/trunk/ivy/hadoop-common-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy/hadoop-common-template.xml?rev=949032&view=auto
==============================================================================
--- hadoop/common/trunk/ivy/hadoop-common-template.xml (added)
+++ hadoop/common/trunk/ivy/hadoop-common-template.xml Thu May 27 22:46:48 2010
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ <version>0.52</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>6.1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ <version>0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: hadoop/common/trunk/ivy/hadoop-common-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: hadoop/common/trunk/ivy/hadoop-common-test-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/ivy/hadoop-common-test-template.xml?rev=949032&view=auto
==============================================================================
--- hadoop/common/trunk/ivy/hadoop-common-test-template.xml (added)
+++ hadoop/common/trunk/ivy/hadoop-common-test-template.xml Thu May 27 22:46:48 2010
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common-test</artifactId>
+ <packaging>jar</packaging>
+ <version>@version</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>@version</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftplet-api</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.0.0-M5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-deprecated</artifactId>
+ <version>1.0.0-M2</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: hadoop/common/trunk/ivy/hadoop-common-test-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/common/trunk/src/docs/cn/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/docs/cn/src/documentation/skinconf.xml?rev=949032&r1=949031&r2=949032&view=diff
==============================================================================
--- hadoop/common/trunk/src/docs/cn/src/documentation/skinconf.xml (original)
+++ hadoop/common/trunk/src/docs/cn/src/documentation/skinconf.xml Thu May 27 22:46:48 2010
@@ -99,7 +99,7 @@ which will be used to configure the chos
<trail>
<link1 name="Apache" href="http://www.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>
<!-- Configure the TOC, i.e. the Table of Contents.
Modified: hadoop/common/trunk/src/docs/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/docs/src/documentation/skinconf.xml?rev=949032&r1=949031&r2=949032&view=diff
==============================================================================
--- hadoop/common/trunk/src/docs/src/documentation/skinconf.xml (original)
+++ hadoop/common/trunk/src/docs/src/documentation/skinconf.xml Thu May 27 22:46:48 2010
@@ -99,7 +99,7 @@ which will be used to configure the chos
<trail>
<link1 name="Apache" href="http://www.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>
<!-- Configure the TOC, i.e. the Table of Contents.
Modified: hadoop/common/trunk/src/test/aop/build/aop.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/aop/build/aop.xml?rev=949032&r1=949031&r2=949032&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/aop/build/aop.xml (original)
+++ hadoop/common/trunk/src/test/aop/build/aop.xml Thu May 27 22:46:48 2010
@@ -29,11 +29,11 @@
<!-- Properties specifically for system fault-injections and system tests -->
<property name="herriot.suffix" value="instrumented"/>
- <property name="hadoop-core-instrumented.pom"
- location="${ivy.dir}/hadoop-core-${herriot.suffix}.xml" />
- <property name="hadoop-core-instrumented.jar"
+ <property name="hadoop-common-instrumented.pom"
+ location="${ivy.dir}/hadoop-common-${herriot.suffix}.xml" />
+ <property name="hadoop-common-instrumented.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" />
<!--All Fault Injection (FI) related targets are located in this session -->
@@ -120,7 +120,7 @@
</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 -->
<!-- =============================================================== -->
<target name="jar-system"
@@ -252,22 +252,22 @@
<!-- Maven -->
<target name="-mvn-system-install" depends="mvn-taskdef, jar-system">
- <artifact:pom file="${hadoop-core-instrumented.pom}" id="hadoop.core.${herriot.suffix}"/>
- <artifact:install file="${hadoop-core-instrumented.jar}">
+ <artifact:pom file="${hadoop-common-instrumented.pom}" id="hadoop.core.${herriot.suffix}"/>
+ <artifact:install file="${hadoop-common-instrumented.jar}">
<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>
</target>
<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}"/>
<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}"/>
<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>
</target>
<!-- End of Maven -->