zookeeper-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	ph...@apache.org
Subject	svn commit: r671284 [1/3] - in /hadoop/zookeeper/trunk: ./ bin/ src/ src/java/jmx/org/apache/zookeeper/jmx/ src/java/jmx/org/apache/zookeeper/jmx/server/ src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ src/java/jmx/org/apache/zookeeper/server/ src...
Date	Tue, 24 Jun 2008 18:20:50 GMT
Author: phunt Date: Tue Jun 24 11:20:47 2008 New Revision: 671284 URL: http://svn.apache.org/viewvc?rev=671284&view=rev Log: Updated code/build to support the new package prefix of org.apache.zookeeper. See ZOOKEEPER-45 Added: hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientBase.java (with props) hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherFuncTest.java (with props) Modified: hadoop/zookeeper/trunk/README.txt hadoop/zookeeper/trunk/bin/zkCleanup.sh hadoop/zookeeper/trunk/bin/zkCli.sh hadoop/zookeeper/trunk/bin/zkServer.sh hadoop/zookeeper/trunk/build.xml hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/ZKMBeanInfo.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryInputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryOutputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvInputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvOutputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Index.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/InputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/OutputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Record.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordReader.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordWriter.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Utils.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlInputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlOutputArchive.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CGenerator.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CppGenerator.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBoolean.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBuffer.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JByte.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JCompType.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JDouble.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JField.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFile.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JFloat.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JInt.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JLong.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JMap.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JString.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JType.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JVector.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JavaGenerator.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/ParseException.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Rcc.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccConstants.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Token.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/rcc.jj hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/AsyncCallback.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Version.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/Watcher.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooDefs.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataNode.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/RequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxn.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerConfig.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerStats.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTracker.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/TraceFormatter.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/HostAuthenticationProvider.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerHandler.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerSessionTracker.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumStats.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Vote.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/Profiler.java hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/version/util/VerGen.java hadoop/zookeeper/trunk/src/java/test/config/findbugsExcludeFile.xml hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/DataTreeTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/GenerateLoad.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/OOMTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RecoveryTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SledgeHammer.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/TestHammer.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java hadoop/zookeeper/trunk/src/zookeeper.jute Modified: hadoop/zookeeper/trunk/README.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/README.txt?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/README.txt (original) +++ hadoop/zookeeper/trunk/README.txt Tue Jun 24 11:20:47 2008 @@ -11,7 +11,7 @@ 2) start the server with the following comand line: -java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar com.yahoo.zookeeper.server.quorum.QuorumPeer conf/zoo.cfg +java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar org.apache.zookeeper.server.quorum.QuorumPeer conf/zoo.cfg Notice that the server is picking up the log4j.properties file from the conf directory (default). @@ -21,7 +21,7 @@ 1) run the following command -java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar com.yahoo.zookeeper.ZooKeeper <server>:<port> +java -cp zookeeper-dev.jar:java/lib/log4j-1.2.15.jar org.apache.zookeeper.ZooKeeper <server>:<port> where server and port correspond to the ZooKeeper configuration. Modified: hadoop/zookeeper/trunk/bin/zkCleanup.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkCleanup.sh?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkCleanup.sh (original) +++ hadoop/zookeeper/trunk/bin/zkCleanup.sh Tue Jun 24 11:20:47 2008 @@ -18,4 +18,4 @@ java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ -cp $CLASSPATH $JVMFLAGS \ - com.yahoo.zookeeper.server.PurgeTxnLog $dataDir + org.apache.zookeeper.server.PurgeTxnLog $dataDir Modified: hadoop/zookeeper/trunk/bin/zkCli.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkCli.sh?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkCli.sh (original) +++ hadoop/zookeeper/trunk/bin/zkCli.sh Tue Jun 24 11:20:47 2008 @@ -18,4 +18,4 @@ java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ -cp $CLASSPATH $JVMFLAGS \ - com.yahoo.zookeeper.ZooKeeper $@ + org.apache.zookeeper.ZooKeeper $@ Modified: hadoop/zookeeper/trunk/bin/zkServer.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkServer.sh?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkServer.sh (original) +++ hadoop/zookeeper/trunk/bin/zkServer.sh Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ start) echo -n "Starting zookeeper ... " java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ - -cp $CLASSPATH $JVMFLAGS com.yahoo.zookeeper.server.quorum.QuorumPeer $ZOOCFG & + -cp $CLASSPATH $JVMFLAGS org.apache.zookeeper.server.quorum.QuorumPeer $ZOOCFG & echo STARTED ;; stop) Modified: hadoop/zookeeper/trunk/build.xml URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/build.xml (original) +++ hadoop/zookeeper/trunk/build.xml Tue Jun 24 11:20:47 2008 @@ -1,42 +1,62 @@ +<?xml version="1.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="ZooKeeper" default="jar"> <property name="Name" value="ZooKeeper" /> <property name="name" value="zookeeper" /> - <property name="version" value="2.2.0" /> + <property name="version" value="3.0.0" /> <property name="revision.dir" value="${basedir}/.revision" /> <property name="revision.properties" value="revision.properties" /> - <property file="${basedir}/java/${revision.properties}" /> + <property file="${basedir}/src/java/${revision.properties}" /> <!-- Target JDK version to build for. Certain zookeeper features --> <!-- (for example, JMX) are only supported on JDK 1.6 --> <property name="target.jdk" value="${ant.java.version}" /> - <property name="src.dir" value="${basedir}/java/src" /> - <property name="jmx.src.dir" value="${basedir}/java/jmx" /> - <property name="lib.dir" value="${basedir}/java/lib" /> + <property name="src.dir" value="${basedir}/src" /> + <property name="java.src.dir" value="${src.dir}/java/main" /> + <property name="jmx.src.dir" value="${src.dir}/java/jmx" /> + <property name="lib.dir" value="${src.dir}/java/lib" /> <property name="build.dir" value="${basedir}/build" /> <property name="distribution" value="${basedir}/distribution" /> - <property name="src_generated.dir" value="${basedir}/java/generated" /> - <property name="csrc_generated.dir" value="${basedir}/c/generated" /> + <property name="src_generated.dir" value="${src.dir}/java/generated" /> + <property name="csrc_generated.dir" value="${src.dir}/c/generated" /> <property name="build.classes" value="${build.dir}/classes" /> <property name="jar.name" value="zookeeper-dev.jar" /> - <property name="jute.file" value="${basedir}/zookeeper.jute" /> + <property name="jute.file" value="${src.dir}/zookeeper.jute" /> <property name="build.testclasses" value="${build.dir}/testclasses"/> <property name="test.build.dir" value="${build.dir}/test" /> - <property name="test.src.dir" value="${basedir}/test"/> + <property name="test.src.dir" value="${src.dir}/java/test"/> <property name="test.log.dir" value="${test.build.dir}/logs" /> <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="config.dir" value="${basedir}/test/config" /> + <property name="config.dir" value="${src.dir}/java/test/config" /> <property name="test.junit.maxmem" value="512m" /> <property name="conf.dir" value="${basedir}/conf"/> <property name="javadoc.link.java" value="http://java.sun.com/j2se/${target.jdk}/docs/api/" /> - <property name="javadoc.packages" value="com.yahoo." /> + <property name="javadoc.packages" value="org.apache." /> <property name="build.docs" value="${build.dir}/docs" /> <property name="build.javadoc" value="${build.docs}/api" /> @@ -72,8 +92,8 @@ </target> <target name="jute" depends="init"> - <javac srcdir="${src.dir}" destdir="${build.classes}" target="${target.jdk}" - includes="com/yahoo/jute/" debug="on" /> + <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}" + includes="org/apache/jute/" debug="on" /> </target> <target name="compile_jute_uptodate"> @@ -85,7 +105,7 @@ <target name="compile_jute" depends="jute,compile_jute_uptodate" unless="juteBuild.notRequired"> <mkdir dir="${src_generated.dir}" /> <mkdir dir="${csrc_generated.dir}" /> - <java classname="com.yahoo.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}"> + <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}"> <arg value="-l" /> <arg value="java" /> <arg value="../../zookeeper.jute" /> @@ -94,7 +114,7 @@ </classpath> </java> - <java classname="com.yahoo.jute.compiler.generated.Rcc" fork="true" dir="${csrc_generated.dir}"> + <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${csrc_generated.dir}"> <arg value="-l" /> <arg value="c" /> <arg value="../../zookeeper.jute" /> @@ -107,13 +127,13 @@ </target> <target name="ver-gen" depends="init"> - <javac srcdir="${src.dir}" destdir="${build.classes}" target="${target.jdk}" - includes="com/yahoo/zookeeper/version/util/" debug="on" /> + <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}" + includes="org/apache/zookeeper/version/util/" debug="on" /> </target> <target name="svn-revision" unless="lastRevision"> <svn> - <status path="${basedir}/java" lastChangedRevisionProperty="lastRevision" /> + <status path="${java.src.dir}/java" lastChangedRevisionProperty="lastRevision" /> </svn> <mkdir dir="${revision.dir}" /> <echo file="${revision.dir}/${revision.properties}" @@ -122,10 +142,11 @@ <target name="version-info" depends="ver-gen,svn-revision"> <mkdir dir="${src_generated.dir}" /> - <java classname="com.yahoo.zookeeper.version.util.VerGen" fork="true" + <java classname="org.apache.zookeeper.version.util.VerGen" fork="true" dir="${src_generated.dir}"> <arg value="${version}" /> - <arg value="${lastRevision}" /> + <!--PDH fixme - <arg value="${lastRevision}" />--> + <arg value="1" /> <arg value="${build.time}" /> <classpath> <pathelement path="${build.classes}" /> @@ -149,12 +170,12 @@ </target> <target name="compile-main" depends="build-generated"> - <javac srcdir="${src.dir}" destdir="${build.classes}" + <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}" debug="on"> <classpath refid="project.classpath"/> </javac> <copy todir="${build.classes}"> - <fileset dir="${src.dir}"/> + <fileset dir="${java.src.dir}"/> <fileset dir="${src_generated.dir}"/> </copy> </target> @@ -185,10 +206,10 @@ <!-- ====================================================== --> <target name="javadoc" depends="jar"> <mkdir dir="${build.javadoc}" /> - <javadoc packagenames="com.yahoo." destdir="${build.javadoc}" author="true" version="true" + <javadoc packagenames="org.apache." destdir="${build.javadoc}" author="true" version="true" use="true" windowtitle="${Name} ${version} API" doctitle="${Name} ${version} API" - bottom="Copyright &copy; ${year} Yahoo Inc."> - <packageset dir="${src.dir}" /> + bottom="Copyright &copy; ${year} The Apache Software Foundation"> + <packageset dir="${java.src.dir}" /> <link href="${javadoc.link.java}" /> </javadoc> </target> @@ -197,7 +218,7 @@ <!-- Make zookeeper.jar --> <!-- ====================================================== --> <target name="jar" depends="compile"> - <java classname="com.yahoo.zookeeper.Version" fork="true" outputproperty="revision" failonerror="true"> + <java classname="org.apache.zookeeper.Version" fork="true" outputproperty="revision" failonerror="true"> <arg value="--revision" /> <classpath> <pathelement path="${build.classes}" /> @@ -208,13 +229,13 @@ <fileset file="LICENSE" /> <fileset dir="${build.classes}" excludes="/.generated"/> <manifest> - <attribute name="Main-Class" value="com.yahoo.zookeeper.server.quorum.QuorumPeer" /> + <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" /> <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="com.yahoo.zookeeper"/> + <attribute name="Implementation-Title" value="org.apache.zookeeper"/> <attribute name="Implementation-Version" value="${revision}"/> - <attribute name="Implementation-Vendor" value="Yahoo! Inc."/> + <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/> </manifest> </jar> </target> @@ -351,7 +372,7 @@ <mkdir dir="${findbugs.out.dir}" /> <findbugs home="${findbugs.home}" output="xml:withMessages" excludeFilter="${findbugs.exclude.file}" outputFile="${findbugs.report.xmlfile}" effort="max" jvmargs="-Xmx512M"> - <sourcePath path="${src.dir}" /> + <sourcePath path="${java.src.dir}" /> <class location="${basedir}/${jar.name}" /> </findbugs> <xslt style="${findbugs.home}/src/xsl/default.xsl" in="${findbugs.report.xmlfile}" @@ -378,7 +399,7 @@ <target name="cobertura-instrument" depends="compile-test"> <cobertura-instrument todir="${build.dir}/cobertura"> <fileset dir="${build.classes}"> - <include name="com/yahoo/zookeeper//.class"/> + <include name="org/apache/zookeeper//.class"/> </fileset> </cobertura-instrument> </target> @@ -421,7 +442,7 @@ <target name="cobertura-report" depends="cobertura-test"> <cobertura-report format="${test.cobertura.output.format}" destdir="${coveragereport.dir}" > - <fileset dir="${src.dir}"> + <fileset dir="${java.src.dir}"> <include name="*/.java" /> </fileset> <fileset dir="${src_generated.dir}"> Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java Tue Jun 24 11:20:47 2008 @@ -14,14 +14,14 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx; +package org.apache.zookeeper.jmx; /* * A bunch of constants. * TODO: will get rid of it eventually. / public class CommonNames { - public static final String DOMAIN="com.yahoo.ZookeeperService"; + public static final String DOMAIN="org.apache.ZookeeperService"; public static final String DATA_TREE_KEY="DataTree"; public static final String STANDALONE_SERVER_KEY="StandaloneServer"; } Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ limitations under the License. / -package com.yahoo.zookeeper.jmx; +package org.apache.zookeeper.jmx; import java.lang.management.ManagementFactory; import java.util.Map; Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/ZKMBeanInfo.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/ZKMBeanInfo.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/ZKMBeanInfo.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/ZKMBeanInfo.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ limitations under the License. / -package com.yahoo.zookeeper.jmx; +package org.apache.zookeeper.jmx; /* * Zookeeper MBean info interface. MBeanRegistry uses the interface to generate Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java Tue Jun 24 11:20:47 2008 @@ -14,17 +14,17 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server; +package org.apache.zookeeper.jmx.server; import java.util.Arrays; import java.util.Date; import org.apache.log4j.Logger; -import com.yahoo.zookeeper.jmx.MBeanRegistry; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; -import com.yahoo.zookeeper.server.ServerCnxn; -import com.yahoo.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.jmx.MBeanRegistry; +import org.apache.zookeeper.jmx.ZKMBeanInfo; +import org.apache.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.server.ZooKeeperServer; /* * Implementation of connection MBean interface. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server; +package org.apache.zookeeper.jmx.server; /* * This MBean represents a client connection. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java Tue Jun 24 11:20:47 2008 @@ -14,14 +14,14 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server; +package org.apache.zookeeper.jmx.server; import java.io.ByteArrayOutputStream; import org.apache.log4j.Logger; -import com.yahoo.jute.BinaryOutputArchive; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; +import org.apache.jute.BinaryOutputArchive; +import org.apache.zookeeper.jmx.ZKMBeanInfo; /* * This class implements the data tree MBean. @@ -29,12 +29,12 @@ public class DataTreeBean implements DataTreeMXBean, ZKMBeanInfo { private static final Logger LOG = Logger.getLogger(DataTreeBean.class); - com.yahoo.zookeeper.server.DataTree dataTree; + org.apache.zookeeper.server.DataTree dataTree; public DataTreeBean(){ } - public DataTreeBean(com.yahoo.zookeeper.server.DataTree dataTree){ + public DataTreeBean(org.apache.zookeeper.server.DataTree dataTree){ this.dataTree=dataTree; } @@ -43,7 +43,7 @@ } /* (non-Javadoc) - * @see com.yahoo.zookeeper.jmx.server.DataTreeMBean#getDataSize() + * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getDataSize() / //TODO: it's useful info but can be expensive to get public long getDataSize() { @@ -61,14 +61,14 @@ } / (non-Javadoc) - * @see com.yahoo.zookeeper.jmx.server.DataTreeMBean#getEphemeralCount() + * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getEphemeralCount() / public int getEphemeralCount() { return dataTree.getSessions().size(); } / (non-Javadoc) - * @see com.yahoo.zookeeper.jmx.server.DataTreeMBean#getWatchCount() + * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getWatchCount() / public int getWatchCount() { return dataTree.getWatchCount(); Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ limitations under the License. / -package com.yahoo.zookeeper.jmx.server; +package org.apache.zookeeper.jmx.server; /* * Zookeeper data tree MBean. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java Tue Jun 24 11:20:47 2008 @@ -14,16 +14,16 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server; +package org.apache.zookeeper.jmx.server; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Date; -import com.yahoo.zookeeper.Version; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; -import com.yahoo.zookeeper.server.ServerConfig; -import com.yahoo.zookeeper.server.ServerStats; +import org.apache.zookeeper.Version; +import org.apache.zookeeper.jmx.ZKMBeanInfo; +import org.apache.zookeeper.server.ServerConfig; +import org.apache.zookeeper.server.ServerStats; /* * This class implements the zookeeper server MBean interface. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server; +package org.apache.zookeeper.jmx.server; /* * Zookeeper server MBean. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * Follower MBean inteface implementation Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * Follower MBean Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * Leader MBean interface implementation. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; import java.util.Date; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; +import org.apache.zookeeper.jmx.ZKMBeanInfo; /* * Leader election MBean interface implementation Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * Leader election protocol MBean. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * Leader MBean. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java Tue Jun 24 11:20:47 2008 @@ -14,10 +14,10 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; -import com.yahoo.zookeeper.jmx.server.ZooKeeperServerBean; -import com.yahoo.zookeeper.server.quorum.QuorumPeer; +import org.apache.zookeeper.jmx.server.ZooKeeperServerBean; +import org.apache.zookeeper.server.quorum.QuorumPeer; /* * Implementation of the local peer MBean interface. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; -import com.yahoo.zookeeper.jmx.server.ZooKeeperServerMXBean; +import org.apache.zookeeper.jmx.server.ZooKeeperServerMXBean; /* * A local zookeeper server MBean interface. Unlike the remote peer, the local Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java Tue Jun 24 11:20:47 2008 @@ -14,10 +14,10 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; -import com.yahoo.zookeeper.server.quorum.QuorumPeer; +import org.apache.zookeeper.jmx.ZKMBeanInfo; +import org.apache.zookeeper.server.quorum.QuorumPeer; public class QuorumBean implements QuorumMXBean,ZKMBeanInfo { Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * An MBean representing a zookeeper cluster nodes (aka quorum peers) Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java Tue Jun 24 11:20:47 2008 @@ -14,10 +14,10 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; -import com.yahoo.zookeeper.server.quorum.QuorumPeer; +import org.apache.zookeeper.jmx.ZKMBeanInfo; +import org.apache.zookeeper.server.quorum.QuorumPeer; /* * A remote peer bean only provides limited information about the remote peer, Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * A proxy for a remote quorum peer. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; import java.util.Date; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; +import org.apache.zookeeper.jmx.ZKMBeanInfo; /* * An abstract base class for the leader and follower MBeans. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.jmx.server.quorum; +package org.apache.zookeeper.jmx.server.quorum; /* * A quorum server MBean. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.File; import java.io.IOException; @@ -22,16 +22,16 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.jmx.MBeanRegistry; -import com.yahoo.zookeeper.jmx.server.ConnectionBean; -import com.yahoo.zookeeper.jmx.server.DataTreeBean; -import com.yahoo.zookeeper.jmx.server.ZooKeeperServerBean; -import com.yahoo.zookeeper.server.util.ConnectionObserver; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.ServerObserver; -import com.yahoo.zookeeper.server.util.ZooKeeperObserverManager; +import org.apache.zookeeper.jmx.MBeanRegistry; +import org.apache.zookeeper.jmx.server.ConnectionBean; +import org.apache.zookeeper.jmx.server.DataTreeBean; +import org.apache.zookeeper.jmx.server.ZooKeeperServerBean; +import org.apache.zookeeper.server.util.ConnectionObserver; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.ServerObserver; +import org.apache.zookeeper.server.util.ZooKeeperObserverManager; -import static com.yahoo.zookeeper.server.ServerConfig.getClientPort; +import static org.apache.zookeeper.server.ServerConfig.getClientPort; /* * This class launches a standalone zookeeper server with JMX support Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java Tue Jun 24 11:20:47 2008 @@ -14,17 +14,17 @@ * limitations under the License. / -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.util.ArrayList; -import com.yahoo.zookeeper.KeeperException; -import com.yahoo.zookeeper.data.ACL; -import com.yahoo.zookeeper.data.Stat; -import com.yahoo.zookeeper.server.util.DataTreeObserver; -import com.yahoo.zookeeper.server.util.EventInfo; -import com.yahoo.zookeeper.server.util.ObservableComponent; -import com.yahoo.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.server.util.DataTreeObserver; +import org.apache.zookeeper.server.util.EventInfo; +import org.apache.zookeeper.server.util.ObservableComponent; +import org.apache.zookeeper.server.util.ObserverManager; /* * An observable data tree notifies its observers about any data modification Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java Tue Jun 24 11:20:47 2008 @@ -14,15 +14,15 @@ * limitations under the License. / -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.IOException; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import com.yahoo.zookeeper.server.util.ConnectionObserver; -import com.yahoo.zookeeper.server.util.ObservableComponent; -import com.yahoo.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.ConnectionObserver; +import org.apache.zookeeper.server.util.ObservableComponent; +import org.apache.zookeeper.server.util.ObserverManager; /* * This class implements an observable server connection. It supports two Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; import java.io.File; import java.io.IOException; Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ limitations under the License. / -package com.yahoo.zookeeper.server; +package org.apache.zookeeper.server; -import com.yahoo.zookeeper.server.util.ObservableComponent; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.ServerObserver; +import org.apache.zookeeper.server.util.ObservableComponent; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.ServerObserver; /* * The class is responsible for triggering and dispatching of server life cycle events. Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; -import static com.yahoo.zookeeper.server.ServerConfig.getClientPort; +import static org.apache.zookeeper.server.ServerConfig.getClientPort; import java.io.File; import java.io.IOException; @@ -25,28 +25,28 @@ import org.apache.log4j.Logger; -import com.yahoo.zookeeper.jmx.MBeanRegistry; -import com.yahoo.zookeeper.jmx.ZKMBeanInfo; -import com.yahoo.zookeeper.jmx.server.ConnectionBean; -import com.yahoo.zookeeper.jmx.server.DataTreeBean; -import com.yahoo.zookeeper.jmx.server.quorum.FollowerBean; -import com.yahoo.zookeeper.jmx.server.quorum.LeaderBean; -import com.yahoo.zookeeper.jmx.server.quorum.LeaderElectionBean; -import com.yahoo.zookeeper.jmx.server.quorum.LocalPeerBean; -import com.yahoo.zookeeper.jmx.server.quorum.QuorumBean; -import com.yahoo.zookeeper.jmx.server.quorum.RemotePeerBean; -import com.yahoo.zookeeper.jmx.server.quorum.ServerBean; -import com.yahoo.zookeeper.server.ManagedZooKeeperServer; -import com.yahoo.zookeeper.server.NIOServerCnxn; -import com.yahoo.zookeeper.server.ObservableNIOServerCnxn; -import com.yahoo.zookeeper.server.ServerCnxn; -import com.yahoo.zookeeper.server.ZooKeeperServer; -import com.yahoo.zookeeper.server.ZooTrace; -import com.yahoo.zookeeper.server.util.ConnectionObserver; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.QuorumPeerObserver; -import com.yahoo.zookeeper.server.util.ServerObserver; -import com.yahoo.zookeeper.server.util.ZooKeeperObserverManager; +import org.apache.zookeeper.jmx.MBeanRegistry; +import org.apache.zookeeper.jmx.ZKMBeanInfo; +import org.apache.zookeeper.jmx.server.ConnectionBean; +import org.apache.zookeeper.jmx.server.DataTreeBean; +import org.apache.zookeeper.jmx.server.quorum.FollowerBean; +import org.apache.zookeeper.jmx.server.quorum.LeaderBean; +import org.apache.zookeeper.jmx.server.quorum.LeaderElectionBean; +import org.apache.zookeeper.jmx.server.quorum.LocalPeerBean; +import org.apache.zookeeper.jmx.server.quorum.QuorumBean; +import org.apache.zookeeper.jmx.server.quorum.RemotePeerBean; +import org.apache.zookeeper.jmx.server.quorum.ServerBean; +import org.apache.zookeeper.server.ManagedZooKeeperServer; +import org.apache.zookeeper.server.NIOServerCnxn; +import org.apache.zookeeper.server.ObservableNIOServerCnxn; +import org.apache.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.ZooTrace; +import org.apache.zookeeper.server.util.ConnectionObserver; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.QuorumPeerObserver; +import org.apache.zookeeper.server.util.ServerObserver; +import org.apache.zookeeper.server.util.ZooKeeperObserverManager; /* * This class launches a replicated zookeeper server with JMX support Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; -import com.yahoo.zookeeper.server.util.EventInfo; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.QuorumPeerObserver; +import org.apache.zookeeper.server.util.EventInfo; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.QuorumPeerObserver; /* * This observable follower implementation notifies its registered observers Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java Tue Jun 24 11:20:47 2008 @@ -14,14 +14,14 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.File; import java.io.IOException; -import com.yahoo.zookeeper.server.ZooKeeperObserverNotifier; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.ServerObserver; +import org.apache.zookeeper.server.ZooKeeperObserverNotifier; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.ServerObserver; /* * This observable follower server class notifies the registered observers Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java Tue Jun 24 11:20:47 2008 @@ -14,13 +14,13 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.IOException; -import com.yahoo.zookeeper.server.util.EventInfo; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.QuorumPeerObserver; +import org.apache.zookeeper.server.util.EventInfo; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.QuorumPeerObserver; /* * This observable leader implementation notifies its registered observers Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java Tue Jun 24 11:20:47 2008 @@ -14,14 +14,14 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.File; import java.io.IOException; -import com.yahoo.zookeeper.server.ZooKeeperObserverNotifier; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.ServerObserver; +import org.apache.zookeeper.server.ZooKeeperObserverNotifier; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.ServerObserver; /* * This observable leader server class notifies the registered observers Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java Tue Jun 24 11:20:47 2008 @@ -14,18 +14,18 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.quorum; +package org.apache.zookeeper.server.quorum; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import com.yahoo.zookeeper.server.NIOServerCnxn; -import com.yahoo.zookeeper.server.ZooKeeperServer; -import com.yahoo.zookeeper.server.util.EventInfo; -import com.yahoo.zookeeper.server.util.ObservableComponent; -import com.yahoo.zookeeper.server.util.ObserverManager; -import com.yahoo.zookeeper.server.util.QuorumPeerObserver; +import org.apache.zookeeper.server.NIOServerCnxn; +import org.apache.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.util.EventInfo; +import org.apache.zookeeper.server.util.ObservableComponent; +import org.apache.zookeeper.server.util.ObserverManager; +import org.apache.zookeeper.server.util.QuorumPeerObserver; /* * The observable quorum peer sends notifications to all registered observers Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; -import com.yahoo.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.server.ServerCnxn; /* * Application must implement this interface and register its instance with Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java Tue Jun 24 11:20:47 2008 @@ -14,10 +14,10 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; -import com.yahoo.zookeeper.server.DataNode; -import com.yahoo.zookeeper.server.DataTree; +import org.apache.zookeeper.server.DataNode; +import org.apache.zookeeper.server.DataTree; /* * Application must implement this interface and register its instance with Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; /* * A helper interface used to make event generation and dispatching more Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; /* * An observable component is responsible for decoding and dispatching its events Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java Tue Jun 24 11:20:47 2008 @@ -14,7 +14,7 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; import java.util.Collections; import java.util.Map; Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java Tue Jun 24 11:20:47 2008 @@ -14,11 +14,11 @@ limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; -import com.yahoo.zookeeper.server.quorum.Follower; -import com.yahoo.zookeeper.server.quorum.Leader; -import com.yahoo.zookeeper.server.quorum.QuorumPeer; +import org.apache.zookeeper.server.quorum.Follower; +import org.apache.zookeeper.server.quorum.Leader; +import org.apache.zookeeper.server.quorum.QuorumPeer; /* * Application must implement this interface and register its instance with Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java Tue Jun 24 11:20:47 2008 @@ -14,9 +14,9 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; -import com.yahoo.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.ZooKeeperServer; /* * Application must implement this interface and register its instance with Modified: hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java (original) +++ hadoop/zookeeper/trunk/src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java Tue Jun 24 11:20:47 2008 @@ -14,15 +14,15 @@ * limitations under the License. / -package com.yahoo.zookeeper.server.util; +package org.apache.zookeeper.server.util; import java.util.HashSet; import java.util.Set; -import com.yahoo.zookeeper.server.DataTree; -import com.yahoo.zookeeper.server.ServerCnxn; -import com.yahoo.zookeeper.server.ZooKeeperObserverNotifier; -import com.yahoo.zookeeper.server.quorum.QuorumPeer; +import org.apache.zookeeper.server.DataTree; +import org.apache.zookeeper.server.ServerCnxn; +import org.apache.zookeeper.server.ZooKeeperObserverNotifier; +import org.apache.zookeeper.server.quorum.QuorumPeer; /* * Zookeeper specific implementation of ObserverManager. It implements a mapping Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryInputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryInputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryInputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryInputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.DataInput; import java.io.IOException; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryOutputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryOutputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryOutputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/BinaryOutputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; import java.io.ByteArrayOutputStream; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvInputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvInputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvInputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvInputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.InputStreamReader; import java.io.InputStream; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvOutputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvOutputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvOutputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/CsvOutputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; import java.util.List; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Index.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Index.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Index.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Index.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; /* * Interface that acts as an iterator for deserializing maps. Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/InputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/InputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/InputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/InputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; import java.io.ByteArrayOutputStream; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/OutputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/OutputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/OutputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/OutputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; import java.util.List; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Record.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Record.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Record.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Record.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordReader.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordReader.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordReader.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordReader.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; import java.io.InputStream; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordWriter.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordWriter.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordWriter.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/RecordWriter.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; import java.io.OutputStream; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Utils.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Utils.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Utils.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/Utils.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.ByteArrayOutputStream; import java.io.DataInput; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlInputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlInputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlInputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlInputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.InputStream; import java.io.IOException; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlOutputArchive.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlOutputArchive.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlOutputArchive.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/XmlOutputArchive.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute; +package org.apache.jute; import java.io.IOException; import java.util.List; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CGenerator.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CGenerator.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CGenerator.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CGenerator.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; import java.util.ArrayList; import java.io.File; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CppGenerator.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CppGenerator.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CppGenerator.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/CppGenerator.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; import java.util.ArrayList; import java.io.File; Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBoolean.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBoolean.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBoolean.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBoolean.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ limitations under the License. / -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /* * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBuffer.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBuffer.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBuffer.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JBuffer.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. / -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /* * @@ -60,7 +60,7 @@ sb.append(" {\n"); sb.append(" byte[] my = "+fname+";\n"); sb.append(" byte[] ur = "+other+";\n"); - sb.append(" ret = com.yahoo.jute.Utils.compareBytes(my,0,my.length,ur,0,ur.length);\n"); + sb.append(" ret = org.apache.jute.Utils.compareBytes(my,0,my.length,ur,0,ur.length);\n"); sb.append(" }\n"); return sb.toString(); } @@ -73,7 +73,7 @@ } public String genJavaEquals(String fname, String peer) { - return " ret = com.yahoo.jute.Utils.bufEquals("+fname+","+peer+");\n"; + return " ret = org.apache.jute.Utils.bufEquals("+fname+","+peer+");\n"; } public String genJavaHashCode(String fname) { @@ -83,7 +83,7 @@ public String genJavaSlurpBytes(String b, String s, String l) { StringBuffer sb = new StringBuffer(); sb.append(" {\n"); - sb.append(" int i = com.yahoo.jute.Utils.readVInt("+b+", "+s+");\n"); + sb.append(" int i = org.apache.jute.Utils.readVInt("+b+", "+s+");\n"); sb.append(" int z = WritableUtils.getVIntSize(i);\n"); sb.append(" "+s+" += z+i; "+l+" -= (z+i);\n"); sb.append(" }\n"); @@ -93,12 +93,12 @@ public String genJavaCompareBytes() { StringBuffer sb = new StringBuffer(); sb.append(" {\n"); - sb.append(" int i1 = com.yahoo.jute.Utils.readVInt(b1, s1);\n"); - sb.append(" int i2 = com.yahoo.jute.Utils.readVInt(b2, s2);\n"); + sb.append(" int i1 = org.apache.jute.Utils.readVInt(b1, s1);\n"); + sb.append(" int i2 = org.apache.jute.Utils.readVInt(b2, s2);\n"); sb.append(" int z1 = WritableUtils.getVIntSize(i1);\n"); sb.append(" int z2 = WritableUtils.getVIntSize(i2);\n"); sb.append(" s1+=z1; s2+=z2; l1-=z1; l2-=z2;\n"); - sb.append(" int r1 = com.yahoo.jute.Utils.compareBytes(b1,s1,l1,b2,s2,l2);\n"); + sb.append(" int r1 = org.apache.jute.Utils.compareBytes(b1,s1,l1,b2,s2,l2);\n"); sb.append(" if (r1 != 0) { return (r1<0)?-1:0; }\n"); sb.append(" s1+=i1; s2+=i2; l1-=i1; l1-=i2;\n"); sb.append(" }\n"); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JByte.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JByte.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JByte.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JByte.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. / -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /* * Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JCompType.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JCompType.java?rev=671284&r1=671283&r2=671284&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JCompType.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JCompType.java Tue Jun 24 11:20:47 2008 @@ -16,7 +16,7 @@ * limitations under the License. / -package com.yahoo.jute.compiler; +package org.apache.jute.compiler; /* * Abstract base class for all the "compound" types such as ustring,
Mime	Unnamed text/plain (inline, 7-Bit, 89998 bytes)
	View raw message