瀏覽代碼

ZOOKEEPER-1038. Move bookkeeper and hedwig code in subversion


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1087423 13f79535-47bb-0310-9956-ffa450edef68
Benjamin Reed 14 年之前
父節點
當前提交
e13db919e4
共有 3 個文件被更改,包括 2 次插入184 次删除
  1. 2 0
      CHANGES.txt
  2. 0 144
      src/contrib/bookkeeper/build.xml
  3. 0 40
      src/contrib/bookkeeper/ivy.xml

+ 2 - 0
CHANGES.txt

@@ -284,6 +284,8 @@ NEW FEATURES:
 
   ZOOKEEPER-1020. Implement function in C client to determine which host you're currently connected to. (stephen tyree via breed)
 
+  ZOOKEEPER-1038. Move bookkeeper and hedwig code in subversion (breed)
+
 Release 3.3.0 - 2010-03-24
 
 Non-backward compatible changes:

+ 0 - 144
src/contrib/bookkeeper/build.xml

@@ -1,144 +0,0 @@
-<!--
-   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 name="bookkeeper" default="jar">
-  <import file="../build-contrib.xml"/>
-
-	<property name="test.build.dir" value="${build.test}" />
-    <property name="test.src.dir" value="test"/>
-    <property name="test.log.dir" value="${test.build.dir}/logs" />
-    <property name="test.data.dir" value="${test.build.dir}/data" />
-    <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
-    <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
-    <property name="test.output" value="no" />
-    <property name="test.timeout" value="900000" />
-    <property name="test.junit.output.format" value="plain" />
-    <property name="test.junit.fork.mode" value="perTest" />
-    <property name="test.junit.printsummary" value="yes" />
-    <property name="test.junit.haltonfailure" value="no" />
-    <property name="test.junit.maxmem" value="512m" />
-
-  <target name="setjarname">
-    <property name="jarname"
-              value="${build.dir}/zookeeper-${version}-${name}.jar"/>
-  </target>
-
-  <target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init"/>
-
-  <!-- Override jar target to specify main class -->
-  <target name="jar" depends="setjarname, compile">
-    <echo message="contrib: ${name}"/>
-
-    <jar jarfile="${jarname}">
-      <manifest>
-        <attribute name="Main-Class" value="org.apache.zookeeper.util.FatJarMain" />
-        <attribute name="Built-By" value="${user.name}"/>
-        <attribute name="Built-At" value="${build.time}"/>
-        <attribute name="Built-On" value="${host.name}" />
-        <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
-        <attribute name="Implementation-Version" value="${revision}"/>
-        <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-      </manifest>
-      <fileset file="${zk.root}/LICENSE.txt" />
-      <fileset dir="${build.classes}"/>
-    </jar>
-  </target>
-
-  <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile"/>
-
-  <target name="test" depends="checkMainTestCompiled,compile-test,test-init,test-category,junit.run" />
-
-	<target name="compile-test" depends="ivy-retrieve-test,compile">
-  		<property name="target.jdk" value="${ant.java.version}" />	
-		<property name="src.test.local" location="${basedir}/test" />
-		<mkdir dir="${build.test}"/>
-		<javac srcdir="${src.test.local}" 
-			destdir="${build.test}" 
-			target="${target.jdk}" 
-			debug="on" >
-			<classpath refid="classpath" />
-			<classpath>
-				<pathelement location="${zk.root}/build/test/classes"/>
-			</classpath>
-		</javac>
-	</target>
-	
-    <target name="test-init" depends="jar,compile-test">
-        <delete dir="${test.log.dir}" />
-        <delete dir="${test.tmp.dir}" />
-        <delete dir="${test.data.dir}" />
-        <mkdir dir="${test.log.dir}" />
-        <mkdir dir="${test.tmp.dir}" />
-        <mkdir dir="${test.data.dir}" />
-    </target>
-
-	<target name="test-category">
-         <property name="test.category" value=""/>
-    </target>
-
-	<target name="junit.run">
-		<echo message="${test.src.dir}" />
-        <junit showoutput="${test.output}"
-               printsummary="${test.junit.printsummary}"
-               haltonfailure="${test.junit.haltonfailure}"
-               fork="yes"
-               forkmode="${test.junit.fork.mode}"
-               maxmemory="${test.junit.maxmem}"
-               dir="${basedir}" timeout="${test.timeout}"
-               errorProperty="tests.failed" failureProperty="tests.failed">
-          <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
-          <sysproperty key="test.data.dir" value="${test.data.dir}" />
-          <sysproperty key="log4j.configuration"
-                    value="file:${basedir}/conf/log4j.properties" />
-          <classpath refid="classpath"/>
-          <classpath>
-             <pathelement path="${build.test}" />
-             <pathelement location="${zk.root}/build/test/classes"/>
-          </classpath>
-          <formatter type="${test.junit.output.format}" />
-          <batchtest todir="${test.log.dir}" unless="testcase">
-              <fileset dir="${test.src.dir}"
-                     includes="**/*${test.category}Test.java"/>
-          </batchtest>
-          <batchtest todir="${test.log.dir}" if="testcase">
-              <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
-          </batchtest>
-       </junit>
-            <fail if="tests.failed">Tests failed!</fail>
-    </target>
-
-  <target name="package" depends="jar, zookeeperbuildcontrib.package"
-          unless="skip.contrib">
-
-    <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
-
-    <mkdir dir="${dist.dir}/contrib/${name}/test"/>
-    <copy todir="${dist.dir}/contrib/${name}/test">
-      <fileset dir="${basedir}/test"/>
-    </copy>
-    <mkdir dir="${dist.dir}/contrib/${name}/benchmark"/>
-    <copy todir="${dist.dir}/contrib/${name}/benchmark">
-      <fileset dir="${basedir}/benchmark"/>
-    </copy>
-    <mkdir dir="${dist.dir}/contrib/${name}/src"/>
-    <copy todir="${dist.dir}/contrib/${name}/src">
-      <fileset dir="${basedir}/src"/>
-    </copy>
-  </target>
-
-</project>
-

+ 0 - 40
src/contrib/bookkeeper/ivy.xml

@@ -1,40 +0,0 @@
-<!--
-   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.
--->
-
-<ivy-module version="2.0"
-            xmlns:e="http://ant.apache.org/ivy/extra">
-
-  <info organisation="org.apache.zookeeper"
-        module="${name}" revision="${version}">
-    <license name="Apache 2.0"/>
-    <ivyauthor name="Apache Hadoop" url="http://hadoop.apache.org"/>
-    <description>BookKeeper</description>
-  </info>
-
-  <configurations defaultconfmapping="default">
-    <conf name="default"/>
-    <conf name="test"/>
-  </configurations>
-
-  <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>
-
-</ivy-module>