Author: fpj Date: Tue Jan 5 14:04:28 2010 New Revision: 896044 URL: http://svn.apache.org/viewvc?rev=896044&view=rev Log: ZOOKEEPER-633. Fetch netty using ivy for bookkeeper (giri via fpj)
Added: hadoop/zookeeper/trunk/ivysettings.xml Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/build.xml hadoop/zookeeper/trunk/src/contrib/bookkeeper/ivy.xml hadoop/zookeeper/trunk/src/contrib/build-contrib.xml Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=896044&r1=896043&r2=896044&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Tue Jan 5 14:04:28 2010 @@ -217,6 +217,8 @@ ZOOKEEPER-506. QuorumBase should use default leader election (fpj via breed) + ZOOKEEPER-633. Fetch netty using ivy for bookkeeper (giri via fpj) + NEW FEATURES: ZOOKEEPER-539. generate eclipse project via ant target. (phunt via mahadev) Modified: hadoop/zookeeper/trunk/build.xml URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=896044&r1=896043&r2=896044&view=diff ============================================================================== --- hadoop/zookeeper/trunk/build.xml (original) +++ hadoop/zookeeper/trunk/build.xml Tue Jan 5 14:04:28 2010 @@ -93,6 +93,7 @@ <property name="ivy.lib" value="${build.dir}/lib"/> <property name="ivy.test.lib" value="${build.dir}/test/lib"/> <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/> + <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/> <available property="clover.present" classname="com.cenqua.clover.CloverInstr" @@ -279,21 +280,22 @@ uri="antlib:org.apache.ivy.ant" classpathref="java.classpath"/> <!-- ensure that ivy taskdef is only run once, otw ant will error --> <property name="ivy.initialized" value="true"/> + <ivy:settings id="${ant.project.name}" file="${ivysettings.xml}"/> </target> <target name="ivy-retrieve" depends="init,ivy-init"> - <ivy:retrieve type="jar" conf="default" + <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default" pattern="${ivy.lib}/[artifact]-[revision].[ext]"/> </target> <target name="ivy-retrieve-test" depends="init,ivy-init"> - <ivy:retrieve type="jar" conf="test" + <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="test" pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/> </target> <target name="ivy-retrieve-jdiff" depends="init,ivy-init"> <mkdir dir="${ivy.jdiff.lib}"/> - <ivy:retrieve type="jar" conf="jdiff" + <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="jdiff" pattern="${ivy.jdiff.lib}/[artifact]-[revision].[ext]"/> </target> @@ -569,7 +571,7 @@ <checksum file="${dist.dir}/${final.name}-javadoc.jar" algorithm="md5"/> <checksum file="${dist.dir}/${final.name}-javadoc.jar" algorithm="sha1"/> - <ivy:makepom ivyfile="${basedir}/ivy.xml" + <ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml" pomfile="${dist.dir}/${final.name}.pom"> <mapping conf="default" scope="compile"/> <mapping conf="test" scope="test"/> Added: hadoop/zookeeper/trunk/ivysettings.xml URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/ivysettings.xml?rev=896044&view=auto ============================================================================== --- hadoop/zookeeper/trunk/ivysettings.xml (added) +++ hadoop/zookeeper/trunk/ivysettings.xml Tue Jan 5 14:04:28 2010 @@ -0,0 +1,41 @@ +<ivysettings> + + <!-- + 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. +--> + + <property name="repo.maven.org" + value="http://repo1.maven.org/maven2/" override="false"/> + <property name="repo.jboss.org" + value="http://repository.jboss.com/maven2/" override="false"/> + <property name="maven2.pattern" + value="[organisation]/[module]/[revision]/[module]-[revision]"/> + <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/> + <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/> + <settings defaultResolver="default"/> + <resolvers> + <ibiblio name="maven2" root="${repo.maven.org}" + pattern="${maven2.pattern.ext}" m2compatible="true"/> + <ibiblio name="jboss-maven2" root="${repo.jboss.org}" + pattern="${maven2.pattern.ext}" m2compatible="true"/> + + <chain name="default" dual="true"> + <resolver ref="maven2"/> + <resolver ref="jboss-maven2"/> + </chain> + + </resolvers> +</ivysettings> Modified: hadoop/zookeeper/trunk/src/contrib/bookkeeper/ivy.xml URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/bookkeeper/ivy.xml?rev=896044&r1=896043&r2=896044&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/contrib/bookkeeper/ivy.xml (original) +++ hadoop/zookeeper/trunk/src/contrib/bookkeeper/ivy.xml Tue Jan 5 14:04:28 2010 @@ -33,7 +33,7 @@ <dependencies> <!-- transitive false turns off dependency checking, log4j deps seem borked --> <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/> - + <dependency org="org.jboss.netty" name="netty" rev="3.1.5.GA" /> <dependency org="junit" name="junit" rev="4.7" conf="test->default"/> </dependencies> Modified: hadoop/zookeeper/trunk/src/contrib/build-contrib.xml URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/build-contrib.xml?rev=896044&r1=896043&r2=896044&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/contrib/build-contrib.xml (original) +++ hadoop/zookeeper/trunk/src/contrib/build-contrib.xml Tue Jan 5 14:04:28 2010 @@ -47,6 +47,7 @@ <property name="ivy.home" value="${user.home}/.ant" /> <property name="ivy.lib" value="${build.dir}/lib"/> <property name="ivy.test.lib" value="${build.test}/lib"/> + <property name="ivysettings.xml" value="${zk.root}/ivysettings.xml"/> <!-- to be overridden by sub-projects --> <target name="check-contrib"/> @@ -188,15 +189,18 @@ uri="antlib:org.apache.ivy.ant" classpathref="classpath"/> <!-- ensure that ivy taskdef is only run once, otw ant will error --> <property name="ivy.initialized" value="true"/> + <ivy:settings id="${ant.project.name}" file="${ivysettings.xml}"/> </target> <target name="ivy-retrieve" depends="init,ivy-init"> - <ivy:retrieve type="jar" conf="default" + <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default" pattern="${ivy.lib}/[artifact]-[revision].[ext]"/> + <ivy:retrieve settingsRef="${ant.project.name}" type="bundle" conf="default" + pattern="${ivy.lib}/[artifact]-[revision].[ext]"/> </target> <target name="ivy-retrieve-test" depends="init,ivy-init"> - <ivy:retrieve type="jar" conf="test" + <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="test" pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/> </target>