From 165d4dc5d02ad37f2cb20c13681fd22efaf42fbc Mon Sep 17 00:00:00 2001 From: Norbert Kalmar Date: Tue, 17 Jul 2018 12:08:16 +0200 Subject: [PATCH 1/4] ZOOKEEPER-3030 - MAVEN MIGRATION - move contrib directories --- build.xml | 2 +- .../contrib => zookeeper-contrib}/build-contrib.xml | 2 +- {src/contrib => zookeeper-contrib}/build.xml | 2 +- .../zookeeper-contrib-fatjar}/README.txt | 0 .../zookeeper-contrib-fatjar}/build.xml | 0 .../zookeeper-contrib-fatjar}/conf/mainClasses | 0 .../java/org/apache/zookeeper/util/FatJarMain.java | 0 .../zookeeper-contrib-huebrowser}/README | 0 .../zookeeper-contrib-huebrowser}/zkui/Makefile | 0 .../zookeeper-contrib-huebrowser}/zkui/setup.py | 0 .../zkui/src/zkui/__init__.py | 0 .../zkui/src/zkui/forms.py | 0 .../zkui/src/zkui/models.py | 0 .../zkui/src/zkui/rest.py | 0 .../zkui/src/zkui/settings.py | 0 .../zkui/src/zkui/static/art/line_icons.png | Bin .../zkui/src/zkui/static/art/zkui.png | Bin .../zkui/src/zkui/static/bootstrap.js | 0 .../zkui/src/zkui/static/css/zkui.css | 0 .../zkui/src/zkui/static/help/index.html | 0 .../zkui/src/zkui/static/js/Source/Zkui/Zkui.js | 0 .../zkui/src/zkui/static/js/package.yml | 0 .../zkui/src/zkui/stats.py | 0 .../zkui/src/zkui/templates/clients.mako | 0 .../zkui/src/zkui/templates/create.mako | 0 .../zkui/src/zkui/templates/edit.mako | 0 .../zkui/src/zkui/templates/index.mako | 0 .../zkui/src/zkui/templates/shared_components.mako | 0 .../zkui/src/zkui/templates/tree.mako | 0 .../zkui/src/zkui/templates/view.mako | 0 .../zkui/src/zkui/urls.py | 0 .../zkui/src/zkui/utils.py | 0 .../zkui/src/zkui/views.py | 0 .../zkui/src/zkui/windmilltests.py | 0 .../zookeeper-contrib-loggraph}/README.txt | 0 .../zookeeper-contrib-loggraph}/bin/loggraph-dev.sh | 0 .../zookeeper-contrib-loggraph}/bin/loggraph.sh | 0 .../zookeeper-contrib-loggraph}/build.xml | 0 .../zookeeper-contrib-loggraph}/ivy.xml | 0 .../org/apache/zookeeper/graph/FilterException.java | 0 .../java/org/apache/zookeeper/graph/FilterOp.java | 0 .../org/apache/zookeeper/graph/FilterParser.java | 0 .../org/apache/zookeeper/graph/JsonGenerator.java | 0 .../java/org/apache/zookeeper/graph/Log4JEntry.java | 0 .../org/apache/zookeeper/graph/Log4JSource.java | 0 .../java/org/apache/zookeeper/graph/LogEntry.java | 0 .../org/apache/zookeeper/graph/LogIterator.java | 0 .../java/org/apache/zookeeper/graph/LogServer.java | 0 .../org/apache/zookeeper/graph/LogSkipList.java | 0 .../java/org/apache/zookeeper/graph/LogSource.java | 0 .../apache/zookeeper/graph/MeasureThroughput.java | 0 .../org/apache/zookeeper/graph/MergedLogSource.java | 0 .../zookeeper/graph/RandomAccessFileReader.java | 0 .../apache/zookeeper/graph/TransactionEntry.java | 0 .../org/apache/zookeeper/graph/TxnLogSource.java | 0 .../org/apache/zookeeper/graph/filterops/AndOp.java | 0 .../org/apache/zookeeper/graph/filterops/Arg.java | 0 .../apache/zookeeper/graph/filterops/EqualsOp.java | 0 .../zookeeper/graph/filterops/GreaterThanOp.java | 0 .../zookeeper/graph/filterops/LessThanOp.java | 0 .../org/apache/zookeeper/graph/filterops/NotOp.java | 0 .../apache/zookeeper/graph/filterops/NumberArg.java | 0 .../org/apache/zookeeper/graph/filterops/OrOp.java | 0 .../apache/zookeeper/graph/filterops/StringArg.java | 0 .../apache/zookeeper/graph/filterops/SymbolArg.java | 0 .../org/apache/zookeeper/graph/filterops/XorOp.java | 0 .../apache/zookeeper/graph/servlets/FileLoader.java | 0 .../org/apache/zookeeper/graph/servlets/Fs.java | 0 .../apache/zookeeper/graph/servlets/GraphData.java | 0 .../zookeeper/graph/servlets/JsonServlet.java | 0 .../apache/zookeeper/graph/servlets/NumEvents.java | 0 .../zookeeper/graph/servlets/StaticContent.java | 0 .../apache/zookeeper/graph/servlets/Throughput.java | 0 .../web/org/apache/zookeeper/graph/log4j.properties | 0 .../apache/zookeeper/graph/resources/date.format.js | 0 .../org/apache/zookeeper/graph/resources/g.bar.js | 0 .../org/apache/zookeeper/graph/resources/g.dot.js | 0 .../org/apache/zookeeper/graph/resources/g.line.js | 0 .../org/apache/zookeeper/graph/resources/g.pie.js | 0 .../apache/zookeeper/graph/resources/g.raphael.js | 0 .../apache/zookeeper/graph/resources/load-big.gif | Bin .../org/apache/zookeeper/graph/resources/load.gif | Bin .../apache/zookeeper/graph/resources/loggraph.css | 0 .../apache/zookeeper/graph/resources/loggraph.js | 0 .../zookeeper/graph/resources/loggraph.log.js | 0 .../zookeeper/graph/resources/loggraph.server.js | 0 .../zookeeper/graph/resources/loggraph.session.js | 0 .../zookeeper/graph/resources/loggraph.stats.js | 0 .../apache/zookeeper/graph/resources/loggraph.ui.js | 0 .../org/apache/zookeeper/graph/resources/main.html | 0 .../org/apache/zookeeper/graph/resources/raphael.js | 0 .../org/apache/zookeeper/graph/resources/yui-min.js | 0 .../zookeeper-contrib-monitoring}/JMX-RESOURCES | 0 .../zookeeper-contrib-monitoring}/README | 0 .../zookeeper-contrib-monitoring}/cacti/README | 0 .../check_zookeeper.py | 0 .../zookeeper-contrib-monitoring}/ganglia/README | 0 .../ganglia/Screenshot.png | Bin .../ganglia/modpython.conf | 0 .../ganglia/zookeeper.pyconf | 0 .../ganglia/zookeeper_ganglia.py | 0 .../zookeeper-contrib-monitoring}/nagios/README.txt | 0 .../nagios/Screenshot-1.png | Bin .../nagios/Screenshot.png | Bin .../nagios/hostgroups.cfg | 0 .../nagios/services.cfg | 0 .../nagios/zookeeper.cfg | 0 .../zookeeper-contrib-monitoring}/test.py | 0 .../zookeeper-contrib-rest}/NOTICE.txt | 0 .../zookeeper-contrib-rest}/README.txt | 0 .../zookeeper-contrib-rest}/SPEC.txt | 0 .../zookeeper-contrib-rest}/build.xml | 0 .../zookeeper-contrib-rest}/conf/keys/README | 0 .../zookeeper-contrib-rest}/conf/keys/rest.cer | Bin .../zookeeper-contrib-rest}/conf/keys/rest.jks | Bin .../zookeeper-contrib-rest}/conf/log4j.properties | 0 .../zookeeper-contrib-rest}/conf/rest.properties | 0 .../zookeeper-contrib-rest}/ivy.xml | 0 .../zookeeper-contrib-rest}/rest.sh | 0 .../apache/zookeeper/server/jersey/RestMain.java | 0 .../zookeeper/server/jersey/ZooKeeperService.java | 0 .../zookeeper/server/jersey/cfg/Credentials.java | 0 .../zookeeper/server/jersey/cfg/Endpoint.java | 0 .../zookeeper/server/jersey/cfg/HostPort.java | 0 .../zookeeper/server/jersey/cfg/HostPortSet.java | 0 .../apache/zookeeper/server/jersey/cfg/RestCfg.java | 0 .../server/jersey/filters/HTTPBasicAuth.java | 0 .../zookeeper/server/jersey/jaxb/ZChildren.java | 0 .../zookeeper/server/jersey/jaxb/ZChildrenJSON.java | 0 .../apache/zookeeper/server/jersey/jaxb/ZError.java | 0 .../apache/zookeeper/server/jersey/jaxb/ZPath.java | 0 .../zookeeper/server/jersey/jaxb/ZSession.java | 0 .../apache/zookeeper/server/jersey/jaxb/ZStat.java | 0 .../jersey/resources/JAXBContextResolver.java | 0 .../jersey/resources/KeeperExceptionMapper.java | 0 .../jersey/resources/RuntimeExceptionMapper.java | 0 .../server/jersey/resources/SessionsResource.java | 0 .../server/jersey/resources/ZErrorWriter.java | 0 .../server/jersey/resources/ZNodeResource.java | 0 .../zookeeper-contrib-rest}/src/python/README.txt | 0 .../src/python/demo_master_election.py | 0 .../src/python/demo_queue.py | 0 .../zookeeper-contrib-rest}/src/python/test.py | 0 .../src/python/zk_dump_tree.py | 0 .../zookeeper-contrib-rest}/src/python/zkrest.py | 0 .../org/apache/zookeeper/server/jersey/Base.java | 0 .../apache/zookeeper/server/jersey/CreateTest.java | 0 .../apache/zookeeper/server/jersey/DeleteTest.java | 0 .../apache/zookeeper/server/jersey/ExistsTest.java | 0 .../zookeeper/server/jersey/GetChildrenTest.java | 0 .../org/apache/zookeeper/server/jersey/GetTest.java | 0 .../zookeeper/server/jersey/RestTestSuite.java | 0 .../apache/zookeeper/server/jersey/RootTest.java | 0 .../apache/zookeeper/server/jersey/SessionTest.java | 0 .../org/apache/zookeeper/server/jersey/SetTest.java | 0 .../apache/zookeeper/server/jersey/WadlTest.java | 0 .../zookeeper-contrib-rest}/src/test/zkServer.sh | 0 .../zookeeper-contrib-zkfuse}/Makefile.am | 0 .../zookeeper-contrib-zkfuse}/README.txt | 0 .../zookeeper-contrib-zkfuse}/build.xml | 0 .../zookeeper-contrib-zkfuse}/configure.ac | 0 .../zookeeper-contrib-zkfuse}/src/Makefile.am | 0 .../zookeeper-contrib-zkfuse}/src/blockingqueue.h | 0 .../zookeeper-contrib-zkfuse}/src/doxygen.cfg | 0 .../zookeeper-contrib-zkfuse}/src/event.cc | 0 .../zookeeper-contrib-zkfuse}/src/event.h | 0 .../zookeeper-contrib-zkfuse}/src/log.cc | 0 .../zookeeper-contrib-zkfuse}/src/log.h | 0 .../src/log4cxx.properties | 0 .../zookeeper-contrib-zkfuse}/src/mutex.h | 0 .../zookeeper-contrib-zkfuse}/src/thread.cc | 0 .../zookeeper-contrib-zkfuse}/src/thread.h | 0 .../zookeeper-contrib-zkfuse}/src/zkadapter.cc | 0 .../zookeeper-contrib-zkfuse}/src/zkadapter.h | 0 .../zookeeper-contrib-zkfuse}/src/zkfuse.cc | 0 .../zookeeper-contrib-zkperl}/Changes | 0 .../zookeeper-contrib-zkperl}/LICENSE | 0 .../zookeeper-contrib-zkperl}/MANIFEST | 0 .../zookeeper-contrib-zkperl}/Makefile.PL | 0 .../zookeeper-contrib-zkperl}/NOTICE | 0 .../zookeeper-contrib-zkperl}/README | 0 .../zookeeper-contrib-zkperl}/ZooKeeper.pm | 0 .../zookeeper-contrib-zkperl}/ZooKeeper.xs | 0 .../zookeeper-contrib-zkperl}/build.xml | 0 .../build/check_zk_version.c | 0 .../build/check_zk_version.h | 0 .../zookeeper-contrib-zkperl}/t/10_invalid.t | 0 .../zookeeper-contrib-zkperl}/t/15_thread.t | 0 .../zookeeper-contrib-zkperl}/t/20_tie.t | 0 .../zookeeper-contrib-zkperl}/t/22_stat_tie.t | 0 .../zookeeper-contrib-zkperl}/t/24_watch_tie.t | 0 .../zookeeper-contrib-zkperl}/t/30_connect.t | 0 .../zookeeper-contrib-zkperl}/t/35_log.t | 0 .../zookeeper-contrib-zkperl}/t/40_basic.t | 0 .../zookeeper-contrib-zkperl}/t/45_class.t | 0 .../zookeeper-contrib-zkperl}/t/50_access.t | 0 .../zookeeper-contrib-zkperl}/t/60_watch.t | 0 .../zookeeper-contrib-zkperl}/t/util.pl | 0 .../zookeeper-contrib-zkperl}/typemap | 0 .../zookeeper-contrib-zkpython}/README | 0 .../zookeeper-contrib-zkpython}/build.xml | 0 .../zookeeper-contrib-zkpython}/ivy.xml | 0 .../src/c/pyzk_docstrings.h | 0 .../zookeeper-contrib-zkpython}/src/c/zookeeper.c | 0 .../zookeeper-contrib-zkpython}/src/examples/README | 0 .../src/examples/watch_znode_for_changes.py | 0 .../zookeeper-contrib-zkpython}/src/python/setup.py | 0 .../zookeeper-contrib-zkpython}/src/python/zk.py | 0 .../src/test/acl_test.py | 0 .../src/test/async_test.py | 0 .../src/test/callback_test.py | 0 .../src/test/clientid_test.py | 0 .../src/test/close_deadlock_test.py | 0 .../src/test/connection_test.py | 0 .../src/test/create_test.py | 0 .../src/test/delete_test.py | 0 .../src/test/exists_test.py | 0 .../src/test/get_set_test.py | 0 .../src/test/run_tests.sh | 0 .../src/test/zkServer.sh | 0 .../src/test/zktestbase.py | 0 .../zookeeper-contrib-zktreeutil}/Makefile.am | 0 .../zookeeper-contrib-zktreeutil}/README.txt | 0 .../zookeeper-contrib-zktreeutil}/build.xml | 0 .../zookeeper-contrib-zktreeutil}/configure.ac | 0 .../zookeeper-contrib-zktreeutil}/src/Makefile.am | 0 .../zookeeper-contrib-zktreeutil}/src/SimpleTree.h | 0 .../zookeeper-contrib-zktreeutil}/src/ZkAdaptor.cc | 0 .../zookeeper-contrib-zktreeutil}/src/ZkAdaptor.h | 0 .../zookeeper-contrib-zktreeutil}/src/ZkTreeUtil.cc | 0 .../zookeeper-contrib-zktreeutil}/src/ZkTreeUtil.h | 0 .../src/ZkTreeUtilMain.cc | 0 .../tests/zk_sample.xml | 0 .../zookeeper-contrib-zooinspector}/NOTICE.txt | 0 .../zookeeper-contrib-zooinspector}/README.txt | 0 .../zookeeper-contrib-zooinspector}/TODO | 0 .../zookeeper-contrib-zooinspector}/build.xml | 2 +- .../config/defaultConnectionSettings.cfg | 0 .../config/defaultNodeViewers.cfg | 0 .../zookeeper-contrib-zooinspector}/ivy.xml | 0 .../lib/log4j.properties | 0 .../licences/Apache Software Licence v2.0.txt | 0 .../src/java/com/nitido/utils/toaster/Toaster.java | 0 .../apache/zookeeper/inspector/ZooInspector.java | 0 .../encryption/BasicDataEncryptionManager.java | 0 .../inspector/encryption/DataEncryptionManager.java | 0 .../zookeeper/inspector/gui/IconResource.java | 0 .../inspector/gui/NodeViewersChangeListener.java | 0 .../org/apache/zookeeper/inspector/gui/Toolbar.java | 0 .../inspector/gui/ZooInspectorAboutDialog.java | 0 .../gui/ZooInspectorConnectionPropertiesDialog.java | 0 .../gui/ZooInspectorNodeViewersDialog.java | 0 .../inspector/gui/ZooInspectorNodeViewersPanel.java | 0 .../zookeeper/inspector/gui/ZooInspectorPanel.java | 0 .../inspector/gui/ZooInspectorTreeViewer.java | 0 .../org/apache/zookeeper/inspector/gui/about.html | 0 .../inspector/gui/actions/AddNodeAction.java | 0 .../inspector/gui/actions/DeleteNodeAction.java | 0 .../inspector/gui/nodeviewer/NodeViewerACL.java | 0 .../inspector/gui/nodeviewer/NodeViewerData.java | 0 .../gui/nodeviewer/NodeViewerMetaData.java | 0 .../gui/nodeviewer/ZooInspectorNodeViewer.java | 0 .../zookeeper/inspector/logger/LoggerFactory.java | 0 .../zookeeper/inspector/manager/NodeListener.java | 0 .../zookeeper/inspector/manager/NodesCache.java | 0 .../apache/zookeeper/inspector/manager/Pair.java | 0 .../inspector/manager/ZooInspectorManager.java | 0 .../inspector/manager/ZooInspectorManagerImpl.java | 0 .../inspector/manager/ZooInspectorNodeManager.java | 0 .../manager/ZooInspectorNodeTreeManager.java | 0 .../manager/ZooInspectorReadOnlyManager.java | 0 .../org/apache/zookeeper/retry/ZooKeeperRetry.java | 0 .../resources/icons/Tango/16x16/actions/add.png | Bin .../icons/Tango/16x16/actions/document-new.png | Bin .../icons/Tango/16x16/actions/document-save.png | Bin .../resources/icons/Tango/16x16/actions/down.png | Bin .../Tango/16x16/actions/media-playback-start.png | Bin .../Tango/16x16/actions/media-playback-stop.png | Bin .../resources/icons/Tango/16x16/actions/remove.png | Bin .../main/resources/icons/Tango/16x16/actions/up.png | Bin .../icons/Tango/16x16/actions/view-refresh.png | Bin .../icons/Tango/16x16/mimetypes/text-x-generic.png | Bin .../resources/icons/Tango/16x16/places/folder.png | Bin .../icons/Tango/16x16/places/user-trash.png | Bin .../resources/icons/Tango/16x16/status/info.png | Bin .../resources/icons/Tango/22x22/actions/add.png | Bin .../icons/Tango/22x22/actions/document-new.png | Bin .../icons/Tango/22x22/actions/document-save.png | Bin .../resources/icons/Tango/22x22/actions/down.png | Bin .../Tango/22x22/actions/media-playback-start.png | Bin .../Tango/22x22/actions/media-playback-stop.png | Bin .../resources/icons/Tango/22x22/actions/remove.png | Bin .../main/resources/icons/Tango/22x22/actions/up.png | Bin .../icons/Tango/22x22/actions/view-refresh.png | Bin .../icons/Tango/22x22/mimetypes/text-x-generic.png | Bin .../resources/icons/Tango/22x22/places/folder.png | Bin .../icons/Tango/22x22/places/user-trash.png | Bin .../resources/icons/Tango/22x22/status/info.png | Bin .../resources/icons/Tango/24x24/actions/add.png | Bin .../icons/Tango/24x24/actions/document-new.png | Bin .../icons/Tango/24x24/actions/document-save.png | Bin .../resources/icons/Tango/24x24/actions/down.png | Bin .../Tango/24x24/actions/media-playback-start.png | Bin .../Tango/24x24/actions/media-playback-stop.png | Bin .../resources/icons/Tango/24x24/actions/remove.png | Bin .../main/resources/icons/Tango/24x24/actions/up.png | Bin .../icons/Tango/24x24/actions/view-refresh.png | Bin .../icons/Tango/24x24/mimetypes/text-x-generic.png | Bin .../resources/icons/Tango/24x24/places/folder.png | Bin .../icons/Tango/24x24/places/user-trash.png | Bin .../resources/icons/Tango/24x24/status/info.png | Bin .../resources/icons/Tango/32x32/actions/add.png | Bin .../icons/Tango/32x32/actions/document-new.png | Bin .../icons/Tango/32x32/actions/document-save.png | Bin .../resources/icons/Tango/32x32/actions/down.png | Bin .../Tango/32x32/actions/media-playback-start.png | Bin .../Tango/32x32/actions/media-playback-stop.png | Bin .../resources/icons/Tango/32x32/actions/remove.png | Bin .../main/resources/icons/Tango/32x32/actions/up.png | Bin .../icons/Tango/32x32/actions/view-refresh.png | Bin .../icons/Tango/32x32/mimetypes/text-x-generic.png | Bin .../resources/icons/Tango/32x32/places/folder.png | Bin .../icons/Tango/32x32/places/user-trash.png | Bin .../resources/icons/Tango/32x32/status/info.png | Bin .../zooInspector-dev.sh | 0 .../zooInspector.cmd | 0 .../zookeeper-contrib-zooinspector}/zooInspector.sh | 0 327 files changed, 4 insertions(+), 4 deletions(-) rename {src/contrib => zookeeper-contrib}/build-contrib.xml (99%) rename {src/contrib => zookeeper-contrib}/build.xml (96%) rename {src/contrib/fatjar => zookeeper-contrib/zookeeper-contrib-fatjar}/README.txt (100%) rename {src/contrib/fatjar => zookeeper-contrib/zookeeper-contrib-fatjar}/build.xml (100%) rename {src/contrib/fatjar => zookeeper-contrib/zookeeper-contrib-fatjar}/conf/mainClasses (100%) rename {src/contrib/fatjar => zookeeper-contrib/zookeeper-contrib-fatjar}/src/java/org/apache/zookeeper/util/FatJarMain.java (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/README (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/Makefile (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/setup.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/__init__.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/forms.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/models.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/rest.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/settings.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/static/art/line_icons.png (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/static/art/zkui.png (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/static/bootstrap.js (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/static/css/zkui.css (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/static/help/index.html (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/static/js/Source/Zkui/Zkui.js (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/static/js/package.yml (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/stats.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/templates/clients.mako (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/templates/create.mako (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/templates/edit.mako (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/templates/index.mako (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/templates/shared_components.mako (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/templates/tree.mako (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/templates/view.mako (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/urls.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/utils.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/views.py (100%) rename {src/contrib/huebrowser => zookeeper-contrib/zookeeper-contrib-huebrowser}/zkui/src/zkui/windmilltests.py (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/README.txt (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/bin/loggraph-dev.sh (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/bin/loggraph.sh (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/build.xml (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/ivy.xml (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/FilterException.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/FilterOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/FilterParser.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/JsonGenerator.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/Log4JEntry.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/Log4JSource.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/LogEntry.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/LogIterator.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/LogServer.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/LogSkipList.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/LogSource.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/MeasureThroughput.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/MergedLogSource.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/TransactionEntry.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/TxnLogSource.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/AndOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/Arg.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/EqualsOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/LessThanOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/NotOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/NumberArg.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/OrOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/StringArg.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/SymbolArg.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/filterops/XorOp.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/servlets/Fs.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/servlets/GraphData.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/servlets/JsonServlet.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/servlets/StaticContent.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/src/java/org/apache/zookeeper/graph/servlets/Throughput.java (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/log4j.properties (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/date.format.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/g.bar.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/g.dot.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/g.line.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/g.pie.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/g.raphael.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/load-big.gif (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/load.gif (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/loggraph.css (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/loggraph.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/loggraph.log.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/loggraph.server.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/loggraph.session.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/loggraph.stats.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/loggraph.ui.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/main.html (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/raphael.js (100%) rename {src/contrib/loggraph => zookeeper-contrib/zookeeper-contrib-loggraph}/web/org/apache/zookeeper/graph/resources/yui-min.js (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/JMX-RESOURCES (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/README (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/cacti/README (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/check_zookeeper.py (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/ganglia/README (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/ganglia/Screenshot.png (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/ganglia/modpython.conf (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/ganglia/zookeeper.pyconf (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/ganglia/zookeeper_ganglia.py (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/nagios/README.txt (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/nagios/Screenshot-1.png (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/nagios/Screenshot.png (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/nagios/hostgroups.cfg (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/nagios/services.cfg (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/nagios/zookeeper.cfg (100%) rename {src/contrib/monitoring => zookeeper-contrib/zookeeper-contrib-monitoring}/test.py (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/NOTICE.txt (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/README.txt (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/SPEC.txt (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/build.xml (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/conf/keys/README (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/conf/keys/rest.cer (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/conf/keys/rest.jks (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/conf/log4j.properties (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/conf/rest.properties (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/ivy.xml (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/rest.sh (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/RestMain.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/python/README.txt (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/python/demo_master_election.py (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/python/demo_queue.py (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/python/test.py (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/python/zk_dump_tree.py (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/python/zkrest.py (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/Base.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/CreateTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/GetTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/RestTestSuite.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/RootTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/SessionTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/SetTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/org/apache/zookeeper/server/jersey/WadlTest.java (100%) rename {src/contrib/rest => zookeeper-contrib/zookeeper-contrib-rest}/src/test/zkServer.sh (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/Makefile.am (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/README.txt (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/build.xml (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/configure.ac (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/Makefile.am (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/blockingqueue.h (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/doxygen.cfg (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/event.cc (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/event.h (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/log.cc (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/log.h (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/log4cxx.properties (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/mutex.h (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/thread.cc (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/thread.h (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/zkadapter.cc (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/zkadapter.h (100%) rename {src/contrib/zkfuse => zookeeper-contrib/zookeeper-contrib-zkfuse}/src/zkfuse.cc (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/Changes (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/LICENSE (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/MANIFEST (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/Makefile.PL (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/NOTICE (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/README (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/ZooKeeper.pm (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/ZooKeeper.xs (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/build.xml (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/build/check_zk_version.c (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/build/check_zk_version.h (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/10_invalid.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/15_thread.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/20_tie.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/22_stat_tie.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/24_watch_tie.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/30_connect.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/35_log.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/40_basic.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/45_class.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/50_access.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/60_watch.t (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/t/util.pl (100%) rename {src/contrib/zkperl => zookeeper-contrib/zookeeper-contrib-zkperl}/typemap (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/README (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/build.xml (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/ivy.xml (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/c/pyzk_docstrings.h (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/c/zookeeper.c (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/examples/README (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/examples/watch_znode_for_changes.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/python/setup.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/python/zk.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/acl_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/async_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/callback_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/clientid_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/close_deadlock_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/connection_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/create_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/delete_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/exists_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/get_set_test.py (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/run_tests.sh (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/zkServer.sh (100%) rename {src/contrib/zkpython => zookeeper-contrib/zookeeper-contrib-zkpython}/src/test/zktestbase.py (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/Makefile.am (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/README.txt (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/build.xml (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/configure.ac (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/src/Makefile.am (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/src/SimpleTree.h (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/src/ZkAdaptor.cc (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/src/ZkAdaptor.h (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/src/ZkTreeUtil.cc (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/src/ZkTreeUtil.h (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/src/ZkTreeUtilMain.cc (100%) rename {src/contrib/zktreeutil => zookeeper-contrib/zookeeper-contrib-zktreeutil}/tests/zk_sample.xml (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/NOTICE.txt (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/README.txt (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/TODO (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/build.xml (98%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/config/defaultConnectionSettings.cfg (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/config/defaultNodeViewers.cfg (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/ivy.xml (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/lib/log4j.properties (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/licences/Apache Software Licence v2.0.txt (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/com/nitido/utils/toaster/Toaster.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/ZooInspector.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/IconResource.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/about.html (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/NodesCache.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/Pair.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/add.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/document-new.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/document-save.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/down.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/media-playback-start.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/media-playback-stop.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/remove.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/up.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/actions/view-refresh.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/mimetypes/text-x-generic.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/places/folder.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/places/user-trash.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/16x16/status/info.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/add.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/document-new.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/document-save.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/down.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/media-playback-start.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/media-playback-stop.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/remove.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/up.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/actions/view-refresh.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/mimetypes/text-x-generic.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/places/folder.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/places/user-trash.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/22x22/status/info.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/add.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/document-new.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/document-save.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/down.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/media-playback-start.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/media-playback-stop.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/remove.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/up.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/actions/view-refresh.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/mimetypes/text-x-generic.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/places/folder.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/places/user-trash.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/24x24/status/info.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/add.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/document-new.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/document-save.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/down.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/media-playback-start.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/media-playback-stop.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/remove.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/up.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/actions/view-refresh.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/mimetypes/text-x-generic.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/places/folder.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/places/user-trash.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/src/main/resources/icons/Tango/32x32/status/info.png (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/zooInspector-dev.sh (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/zooInspector.cmd (100%) rename {src/contrib/zooinspector => zookeeper-contrib/zookeeper-contrib-zooinspector}/zooInspector.sh (100%) diff --git a/build.xml b/build.xml index 464e155f6de..a813d6f3c63 100644 --- a/build.xml +++ b/build.xml @@ -148,7 +148,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> - + diff --git a/src/contrib/build-contrib.xml b/zookeeper-contrib/build-contrib.xml similarity index 99% rename from src/contrib/build-contrib.xml rename to zookeeper-contrib/build-contrib.xml index d0064483f20..bab2d4510a0 100644 --- a/src/contrib/build-contrib.xml +++ b/zookeeper-contrib/build-contrib.xml @@ -25,7 +25,7 @@ - + diff --git a/src/contrib/build.xml b/zookeeper-contrib/build.xml similarity index 96% rename from src/contrib/build.xml rename to zookeeper-contrib/build.xml index c1a716ced03..bfb6f66ccad 100644 --- a/src/contrib/build.xml +++ b/zookeeper-contrib/build.xml @@ -20,7 +20,7 @@ - + diff --git a/src/contrib/fatjar/README.txt b/zookeeper-contrib/zookeeper-contrib-fatjar/README.txt similarity index 100% rename from src/contrib/fatjar/README.txt rename to zookeeper-contrib/zookeeper-contrib-fatjar/README.txt diff --git a/src/contrib/fatjar/build.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml similarity index 100% rename from src/contrib/fatjar/build.xml rename to zookeeper-contrib/zookeeper-contrib-fatjar/build.xml diff --git a/src/contrib/fatjar/conf/mainClasses b/zookeeper-contrib/zookeeper-contrib-fatjar/conf/mainClasses similarity index 100% rename from src/contrib/fatjar/conf/mainClasses rename to zookeeper-contrib/zookeeper-contrib-fatjar/conf/mainClasses diff --git a/src/contrib/fatjar/src/java/org/apache/zookeeper/util/FatJarMain.java b/zookeeper-contrib/zookeeper-contrib-fatjar/src/java/org/apache/zookeeper/util/FatJarMain.java similarity index 100% rename from src/contrib/fatjar/src/java/org/apache/zookeeper/util/FatJarMain.java rename to zookeeper-contrib/zookeeper-contrib-fatjar/src/java/org/apache/zookeeper/util/FatJarMain.java diff --git a/src/contrib/huebrowser/README b/zookeeper-contrib/zookeeper-contrib-huebrowser/README similarity index 100% rename from src/contrib/huebrowser/README rename to zookeeper-contrib/zookeeper-contrib-huebrowser/README diff --git a/src/contrib/huebrowser/zkui/Makefile b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/Makefile similarity index 100% rename from src/contrib/huebrowser/zkui/Makefile rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/Makefile diff --git a/src/contrib/huebrowser/zkui/setup.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/setup.py similarity index 100% rename from src/contrib/huebrowser/zkui/setup.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/setup.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/__init__.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/__init__.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/__init__.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/__init__.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/forms.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/forms.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/forms.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/forms.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/models.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/models.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/models.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/models.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/rest.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/rest.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/rest.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/rest.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/settings.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/settings.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/settings.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/settings.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/static/art/line_icons.png b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/art/line_icons.png similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/static/art/line_icons.png rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/art/line_icons.png diff --git a/src/contrib/huebrowser/zkui/src/zkui/static/art/zkui.png b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/art/zkui.png similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/static/art/zkui.png rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/art/zkui.png diff --git a/src/contrib/huebrowser/zkui/src/zkui/static/bootstrap.js b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/bootstrap.js similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/static/bootstrap.js rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/bootstrap.js diff --git a/src/contrib/huebrowser/zkui/src/zkui/static/css/zkui.css b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/css/zkui.css similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/static/css/zkui.css rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/css/zkui.css diff --git a/src/contrib/huebrowser/zkui/src/zkui/static/help/index.html b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/help/index.html similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/static/help/index.html rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/help/index.html diff --git a/src/contrib/huebrowser/zkui/src/zkui/static/js/Source/Zkui/Zkui.js b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/js/Source/Zkui/Zkui.js similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/static/js/Source/Zkui/Zkui.js rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/js/Source/Zkui/Zkui.js diff --git a/src/contrib/huebrowser/zkui/src/zkui/static/js/package.yml b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/js/package.yml similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/static/js/package.yml rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/static/js/package.yml diff --git a/src/contrib/huebrowser/zkui/src/zkui/stats.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/stats.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/stats.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/stats.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/templates/clients.mako b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/clients.mako similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/templates/clients.mako rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/clients.mako diff --git a/src/contrib/huebrowser/zkui/src/zkui/templates/create.mako b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/create.mako similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/templates/create.mako rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/create.mako diff --git a/src/contrib/huebrowser/zkui/src/zkui/templates/edit.mako b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/edit.mako similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/templates/edit.mako rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/edit.mako diff --git a/src/contrib/huebrowser/zkui/src/zkui/templates/index.mako b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/index.mako similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/templates/index.mako rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/index.mako diff --git a/src/contrib/huebrowser/zkui/src/zkui/templates/shared_components.mako b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/shared_components.mako similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/templates/shared_components.mako rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/shared_components.mako diff --git a/src/contrib/huebrowser/zkui/src/zkui/templates/tree.mako b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/tree.mako similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/templates/tree.mako rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/tree.mako diff --git a/src/contrib/huebrowser/zkui/src/zkui/templates/view.mako b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/view.mako similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/templates/view.mako rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/templates/view.mako diff --git a/src/contrib/huebrowser/zkui/src/zkui/urls.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/urls.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/urls.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/urls.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/utils.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/utils.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/utils.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/utils.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/views.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/views.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/views.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/views.py diff --git a/src/contrib/huebrowser/zkui/src/zkui/windmilltests.py b/zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/windmilltests.py similarity index 100% rename from src/contrib/huebrowser/zkui/src/zkui/windmilltests.py rename to zookeeper-contrib/zookeeper-contrib-huebrowser/zkui/src/zkui/windmilltests.py diff --git a/src/contrib/loggraph/README.txt b/zookeeper-contrib/zookeeper-contrib-loggraph/README.txt similarity index 100% rename from src/contrib/loggraph/README.txt rename to zookeeper-contrib/zookeeper-contrib-loggraph/README.txt diff --git a/src/contrib/loggraph/bin/loggraph-dev.sh b/zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph-dev.sh similarity index 100% rename from src/contrib/loggraph/bin/loggraph-dev.sh rename to zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph-dev.sh diff --git a/src/contrib/loggraph/bin/loggraph.sh b/zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph.sh similarity index 100% rename from src/contrib/loggraph/bin/loggraph.sh rename to zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph.sh diff --git a/src/contrib/loggraph/build.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml similarity index 100% rename from src/contrib/loggraph/build.xml rename to zookeeper-contrib/zookeeper-contrib-loggraph/build.xml diff --git a/src/contrib/loggraph/ivy.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/ivy.xml similarity index 100% rename from src/contrib/loggraph/ivy.xml rename to zookeeper-contrib/zookeeper-contrib-loggraph/ivy.xml diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterException.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterException.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterException.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterException.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/JsonGenerator.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/JsonGenerator.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/JsonGenerator.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/JsonGenerator.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogEntry.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogEntry.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogEntry.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogEntry.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogServer.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogServer.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogServer.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogServer.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSource.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSource.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/AndOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/AndOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/AndOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/AndOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/Arg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/Arg.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/Arg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/Arg.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/EqualsOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/EqualsOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/EqualsOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/EqualsOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/LessThanOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/LessThanOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/LessThanOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/LessThanOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/NotOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NotOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/NotOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NotOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/NumberArg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NumberArg.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/NumberArg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NumberArg.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/OrOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/OrOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/OrOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/OrOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/StringArg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/StringArg.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/StringArg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/StringArg.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/SymbolArg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/SymbolArg.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/SymbolArg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/SymbolArg.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/XorOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/XorOp.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/filterops/XorOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/XorOp.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/JsonServlet.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/JsonServlet.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/JsonServlet.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/JsonServlet.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/StaticContent.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/StaticContent.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/StaticContent.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/StaticContent.java diff --git a/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java similarity index 100% rename from src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/log4j.properties b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/log4j.properties similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/log4j.properties rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/log4j.properties diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/date.format.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/date.format.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.bar.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.bar.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.bar.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.bar.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.dot.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.dot.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.dot.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.dot.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.line.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.line.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.line.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.line.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.pie.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.pie.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.pie.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.pie.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.raphael.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/g.raphael.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.raphael.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/load-big.gif b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load-big.gif similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/load-big.gif rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load-big.gif diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/load.gif b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load.gif similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/load.gif rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load.gif diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.css b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.css similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.css rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.css diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.log.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.log.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.log.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.log.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.server.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.server.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.server.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.server.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.session.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.session.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.session.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.session.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.stats.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.stats.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.stats.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.stats.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.ui.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.ui.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/loggraph.ui.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.ui.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/main.html b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/main.html similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/main.html rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/main.html diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/raphael.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/raphael.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/raphael.js diff --git a/src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/yui-min.js b/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/yui-min.js similarity index 100% rename from src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/yui-min.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/yui-min.js diff --git a/src/contrib/monitoring/JMX-RESOURCES b/zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES similarity index 100% rename from src/contrib/monitoring/JMX-RESOURCES rename to zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES diff --git a/src/contrib/monitoring/README b/zookeeper-contrib/zookeeper-contrib-monitoring/README similarity index 100% rename from src/contrib/monitoring/README rename to zookeeper-contrib/zookeeper-contrib-monitoring/README diff --git a/src/contrib/monitoring/cacti/README b/zookeeper-contrib/zookeeper-contrib-monitoring/cacti/README similarity index 100% rename from src/contrib/monitoring/cacti/README rename to zookeeper-contrib/zookeeper-contrib-monitoring/cacti/README diff --git a/src/contrib/monitoring/check_zookeeper.py b/zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py similarity index 100% rename from src/contrib/monitoring/check_zookeeper.py rename to zookeeper-contrib/zookeeper-contrib-monitoring/check_zookeeper.py diff --git a/src/contrib/monitoring/ganglia/README b/zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/README similarity index 100% rename from src/contrib/monitoring/ganglia/README rename to zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/README diff --git a/src/contrib/monitoring/ganglia/Screenshot.png b/zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/Screenshot.png similarity index 100% rename from src/contrib/monitoring/ganglia/Screenshot.png rename to zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/Screenshot.png diff --git a/src/contrib/monitoring/ganglia/modpython.conf b/zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/modpython.conf similarity index 100% rename from src/contrib/monitoring/ganglia/modpython.conf rename to zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/modpython.conf diff --git a/src/contrib/monitoring/ganglia/zookeeper.pyconf b/zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/zookeeper.pyconf similarity index 100% rename from src/contrib/monitoring/ganglia/zookeeper.pyconf rename to zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/zookeeper.pyconf diff --git a/src/contrib/monitoring/ganglia/zookeeper_ganglia.py b/zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/zookeeper_ganglia.py similarity index 100% rename from src/contrib/monitoring/ganglia/zookeeper_ganglia.py rename to zookeeper-contrib/zookeeper-contrib-monitoring/ganglia/zookeeper_ganglia.py diff --git a/src/contrib/monitoring/nagios/README.txt b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/README.txt similarity index 100% rename from src/contrib/monitoring/nagios/README.txt rename to zookeeper-contrib/zookeeper-contrib-monitoring/nagios/README.txt diff --git a/src/contrib/monitoring/nagios/Screenshot-1.png b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/Screenshot-1.png similarity index 100% rename from src/contrib/monitoring/nagios/Screenshot-1.png rename to zookeeper-contrib/zookeeper-contrib-monitoring/nagios/Screenshot-1.png diff --git a/src/contrib/monitoring/nagios/Screenshot.png b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/Screenshot.png similarity index 100% rename from src/contrib/monitoring/nagios/Screenshot.png rename to zookeeper-contrib/zookeeper-contrib-monitoring/nagios/Screenshot.png diff --git a/src/contrib/monitoring/nagios/hostgroups.cfg b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/hostgroups.cfg similarity index 100% rename from src/contrib/monitoring/nagios/hostgroups.cfg rename to zookeeper-contrib/zookeeper-contrib-monitoring/nagios/hostgroups.cfg diff --git a/src/contrib/monitoring/nagios/services.cfg b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/services.cfg similarity index 100% rename from src/contrib/monitoring/nagios/services.cfg rename to zookeeper-contrib/zookeeper-contrib-monitoring/nagios/services.cfg diff --git a/src/contrib/monitoring/nagios/zookeeper.cfg b/zookeeper-contrib/zookeeper-contrib-monitoring/nagios/zookeeper.cfg similarity index 100% rename from src/contrib/monitoring/nagios/zookeeper.cfg rename to zookeeper-contrib/zookeeper-contrib-monitoring/nagios/zookeeper.cfg diff --git a/src/contrib/monitoring/test.py b/zookeeper-contrib/zookeeper-contrib-monitoring/test.py similarity index 100% rename from src/contrib/monitoring/test.py rename to zookeeper-contrib/zookeeper-contrib-monitoring/test.py diff --git a/src/contrib/rest/NOTICE.txt b/zookeeper-contrib/zookeeper-contrib-rest/NOTICE.txt similarity index 100% rename from src/contrib/rest/NOTICE.txt rename to zookeeper-contrib/zookeeper-contrib-rest/NOTICE.txt diff --git a/src/contrib/rest/README.txt b/zookeeper-contrib/zookeeper-contrib-rest/README.txt similarity index 100% rename from src/contrib/rest/README.txt rename to zookeeper-contrib/zookeeper-contrib-rest/README.txt diff --git a/src/contrib/rest/SPEC.txt b/zookeeper-contrib/zookeeper-contrib-rest/SPEC.txt similarity index 100% rename from src/contrib/rest/SPEC.txt rename to zookeeper-contrib/zookeeper-contrib-rest/SPEC.txt diff --git a/src/contrib/rest/build.xml b/zookeeper-contrib/zookeeper-contrib-rest/build.xml similarity index 100% rename from src/contrib/rest/build.xml rename to zookeeper-contrib/zookeeper-contrib-rest/build.xml diff --git a/src/contrib/rest/conf/keys/README b/zookeeper-contrib/zookeeper-contrib-rest/conf/keys/README similarity index 100% rename from src/contrib/rest/conf/keys/README rename to zookeeper-contrib/zookeeper-contrib-rest/conf/keys/README diff --git a/src/contrib/rest/conf/keys/rest.cer b/zookeeper-contrib/zookeeper-contrib-rest/conf/keys/rest.cer similarity index 100% rename from src/contrib/rest/conf/keys/rest.cer rename to zookeeper-contrib/zookeeper-contrib-rest/conf/keys/rest.cer diff --git a/src/contrib/rest/conf/keys/rest.jks b/zookeeper-contrib/zookeeper-contrib-rest/conf/keys/rest.jks similarity index 100% rename from src/contrib/rest/conf/keys/rest.jks rename to zookeeper-contrib/zookeeper-contrib-rest/conf/keys/rest.jks diff --git a/src/contrib/rest/conf/log4j.properties b/zookeeper-contrib/zookeeper-contrib-rest/conf/log4j.properties similarity index 100% rename from src/contrib/rest/conf/log4j.properties rename to zookeeper-contrib/zookeeper-contrib-rest/conf/log4j.properties diff --git a/src/contrib/rest/conf/rest.properties b/zookeeper-contrib/zookeeper-contrib-rest/conf/rest.properties similarity index 100% rename from src/contrib/rest/conf/rest.properties rename to zookeeper-contrib/zookeeper-contrib-rest/conf/rest.properties diff --git a/src/contrib/rest/ivy.xml b/zookeeper-contrib/zookeeper-contrib-rest/ivy.xml similarity index 100% rename from src/contrib/rest/ivy.xml rename to zookeeper-contrib/zookeeper-contrib-rest/ivy.xml diff --git a/src/contrib/rest/rest.sh b/zookeeper-contrib/zookeeper-contrib-rest/rest.sh similarity index 100% rename from src/contrib/rest/rest.sh rename to zookeeper-contrib/zookeeper-contrib-rest/rest.sh diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java diff --git a/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java b/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java similarity index 100% rename from src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java diff --git a/src/contrib/rest/src/python/README.txt b/zookeeper-contrib/zookeeper-contrib-rest/src/python/README.txt similarity index 100% rename from src/contrib/rest/src/python/README.txt rename to zookeeper-contrib/zookeeper-contrib-rest/src/python/README.txt diff --git a/src/contrib/rest/src/python/demo_master_election.py b/zookeeper-contrib/zookeeper-contrib-rest/src/python/demo_master_election.py similarity index 100% rename from src/contrib/rest/src/python/demo_master_election.py rename to zookeeper-contrib/zookeeper-contrib-rest/src/python/demo_master_election.py diff --git a/src/contrib/rest/src/python/demo_queue.py b/zookeeper-contrib/zookeeper-contrib-rest/src/python/demo_queue.py similarity index 100% rename from src/contrib/rest/src/python/demo_queue.py rename to zookeeper-contrib/zookeeper-contrib-rest/src/python/demo_queue.py diff --git a/src/contrib/rest/src/python/test.py b/zookeeper-contrib/zookeeper-contrib-rest/src/python/test.py similarity index 100% rename from src/contrib/rest/src/python/test.py rename to zookeeper-contrib/zookeeper-contrib-rest/src/python/test.py diff --git a/src/contrib/rest/src/python/zk_dump_tree.py b/zookeeper-contrib/zookeeper-contrib-rest/src/python/zk_dump_tree.py similarity index 100% rename from src/contrib/rest/src/python/zk_dump_tree.py rename to zookeeper-contrib/zookeeper-contrib-rest/src/python/zk_dump_tree.py diff --git a/src/contrib/rest/src/python/zkrest.py b/zookeeper-contrib/zookeeper-contrib-rest/src/python/zkrest.py similarity index 100% rename from src/contrib/rest/src/python/zkrest.py rename to zookeeper-contrib/zookeeper-contrib-rest/src/python/zkrest.py diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/Base.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/Base.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/Base.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/Base.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RestTestSuite.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RestTestSuite.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RestTestSuite.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RestTestSuite.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java diff --git a/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java similarity index 100% rename from src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java diff --git a/src/contrib/rest/src/test/zkServer.sh b/zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh similarity index 100% rename from src/contrib/rest/src/test/zkServer.sh rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh diff --git a/src/contrib/zkfuse/Makefile.am b/zookeeper-contrib/zookeeper-contrib-zkfuse/Makefile.am similarity index 100% rename from src/contrib/zkfuse/Makefile.am rename to zookeeper-contrib/zookeeper-contrib-zkfuse/Makefile.am diff --git a/src/contrib/zkfuse/README.txt b/zookeeper-contrib/zookeeper-contrib-zkfuse/README.txt similarity index 100% rename from src/contrib/zkfuse/README.txt rename to zookeeper-contrib/zookeeper-contrib-zkfuse/README.txt diff --git a/src/contrib/zkfuse/build.xml b/zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml similarity index 100% rename from src/contrib/zkfuse/build.xml rename to zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml diff --git a/src/contrib/zkfuse/configure.ac b/zookeeper-contrib/zookeeper-contrib-zkfuse/configure.ac similarity index 100% rename from src/contrib/zkfuse/configure.ac rename to zookeeper-contrib/zookeeper-contrib-zkfuse/configure.ac diff --git a/src/contrib/zkfuse/src/Makefile.am b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/Makefile.am similarity index 100% rename from src/contrib/zkfuse/src/Makefile.am rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/Makefile.am diff --git a/src/contrib/zkfuse/src/blockingqueue.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/blockingqueue.h similarity index 100% rename from src/contrib/zkfuse/src/blockingqueue.h rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/blockingqueue.h diff --git a/src/contrib/zkfuse/src/doxygen.cfg b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/doxygen.cfg similarity index 100% rename from src/contrib/zkfuse/src/doxygen.cfg rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/doxygen.cfg diff --git a/src/contrib/zkfuse/src/event.cc b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.cc similarity index 100% rename from src/contrib/zkfuse/src/event.cc rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.cc diff --git a/src/contrib/zkfuse/src/event.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.h similarity index 100% rename from src/contrib/zkfuse/src/event.h rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/event.h diff --git a/src/contrib/zkfuse/src/log.cc b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/log.cc similarity index 100% rename from src/contrib/zkfuse/src/log.cc rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/log.cc diff --git a/src/contrib/zkfuse/src/log.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/log.h similarity index 100% rename from src/contrib/zkfuse/src/log.h rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/log.h diff --git a/src/contrib/zkfuse/src/log4cxx.properties b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/log4cxx.properties similarity index 100% rename from src/contrib/zkfuse/src/log4cxx.properties rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/log4cxx.properties diff --git a/src/contrib/zkfuse/src/mutex.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/mutex.h similarity index 100% rename from src/contrib/zkfuse/src/mutex.h rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/mutex.h diff --git a/src/contrib/zkfuse/src/thread.cc b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.cc similarity index 100% rename from src/contrib/zkfuse/src/thread.cc rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.cc diff --git a/src/contrib/zkfuse/src/thread.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.h similarity index 100% rename from src/contrib/zkfuse/src/thread.h rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/thread.h diff --git a/src/contrib/zkfuse/src/zkadapter.cc b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.cc similarity index 100% rename from src/contrib/zkfuse/src/zkadapter.cc rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.cc diff --git a/src/contrib/zkfuse/src/zkadapter.h b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.h similarity index 100% rename from src/contrib/zkfuse/src/zkadapter.h rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkadapter.h diff --git a/src/contrib/zkfuse/src/zkfuse.cc b/zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkfuse.cc similarity index 100% rename from src/contrib/zkfuse/src/zkfuse.cc rename to zookeeper-contrib/zookeeper-contrib-zkfuse/src/zkfuse.cc diff --git a/src/contrib/zkperl/Changes b/zookeeper-contrib/zookeeper-contrib-zkperl/Changes similarity index 100% rename from src/contrib/zkperl/Changes rename to zookeeper-contrib/zookeeper-contrib-zkperl/Changes diff --git a/src/contrib/zkperl/LICENSE b/zookeeper-contrib/zookeeper-contrib-zkperl/LICENSE similarity index 100% rename from src/contrib/zkperl/LICENSE rename to zookeeper-contrib/zookeeper-contrib-zkperl/LICENSE diff --git a/src/contrib/zkperl/MANIFEST b/zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST similarity index 100% rename from src/contrib/zkperl/MANIFEST rename to zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST diff --git a/src/contrib/zkperl/Makefile.PL b/zookeeper-contrib/zookeeper-contrib-zkperl/Makefile.PL similarity index 100% rename from src/contrib/zkperl/Makefile.PL rename to zookeeper-contrib/zookeeper-contrib-zkperl/Makefile.PL diff --git a/src/contrib/zkperl/NOTICE b/zookeeper-contrib/zookeeper-contrib-zkperl/NOTICE similarity index 100% rename from src/contrib/zkperl/NOTICE rename to zookeeper-contrib/zookeeper-contrib-zkperl/NOTICE diff --git a/src/contrib/zkperl/README b/zookeeper-contrib/zookeeper-contrib-zkperl/README similarity index 100% rename from src/contrib/zkperl/README rename to zookeeper-contrib/zookeeper-contrib-zkperl/README diff --git a/src/contrib/zkperl/ZooKeeper.pm b/zookeeper-contrib/zookeeper-contrib-zkperl/ZooKeeper.pm similarity index 100% rename from src/contrib/zkperl/ZooKeeper.pm rename to zookeeper-contrib/zookeeper-contrib-zkperl/ZooKeeper.pm diff --git a/src/contrib/zkperl/ZooKeeper.xs b/zookeeper-contrib/zookeeper-contrib-zkperl/ZooKeeper.xs similarity index 100% rename from src/contrib/zkperl/ZooKeeper.xs rename to zookeeper-contrib/zookeeper-contrib-zkperl/ZooKeeper.xs diff --git a/src/contrib/zkperl/build.xml b/zookeeper-contrib/zookeeper-contrib-zkperl/build.xml similarity index 100% rename from src/contrib/zkperl/build.xml rename to zookeeper-contrib/zookeeper-contrib-zkperl/build.xml diff --git a/src/contrib/zkperl/build/check_zk_version.c b/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.c similarity index 100% rename from src/contrib/zkperl/build/check_zk_version.c rename to zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.c diff --git a/src/contrib/zkperl/build/check_zk_version.h b/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.h similarity index 100% rename from src/contrib/zkperl/build/check_zk_version.h rename to zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.h diff --git a/src/contrib/zkperl/t/10_invalid.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/10_invalid.t similarity index 100% rename from src/contrib/zkperl/t/10_invalid.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/10_invalid.t diff --git a/src/contrib/zkperl/t/15_thread.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/15_thread.t similarity index 100% rename from src/contrib/zkperl/t/15_thread.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/15_thread.t diff --git a/src/contrib/zkperl/t/20_tie.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/20_tie.t similarity index 100% rename from src/contrib/zkperl/t/20_tie.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/20_tie.t diff --git a/src/contrib/zkperl/t/22_stat_tie.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/22_stat_tie.t similarity index 100% rename from src/contrib/zkperl/t/22_stat_tie.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/22_stat_tie.t diff --git a/src/contrib/zkperl/t/24_watch_tie.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/24_watch_tie.t similarity index 100% rename from src/contrib/zkperl/t/24_watch_tie.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/24_watch_tie.t diff --git a/src/contrib/zkperl/t/30_connect.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/30_connect.t similarity index 100% rename from src/contrib/zkperl/t/30_connect.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/30_connect.t diff --git a/src/contrib/zkperl/t/35_log.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/35_log.t similarity index 100% rename from src/contrib/zkperl/t/35_log.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/35_log.t diff --git a/src/contrib/zkperl/t/40_basic.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/40_basic.t similarity index 100% rename from src/contrib/zkperl/t/40_basic.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/40_basic.t diff --git a/src/contrib/zkperl/t/45_class.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/45_class.t similarity index 100% rename from src/contrib/zkperl/t/45_class.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/45_class.t diff --git a/src/contrib/zkperl/t/50_access.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/50_access.t similarity index 100% rename from src/contrib/zkperl/t/50_access.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/50_access.t diff --git a/src/contrib/zkperl/t/60_watch.t b/zookeeper-contrib/zookeeper-contrib-zkperl/t/60_watch.t similarity index 100% rename from src/contrib/zkperl/t/60_watch.t rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/60_watch.t diff --git a/src/contrib/zkperl/t/util.pl b/zookeeper-contrib/zookeeper-contrib-zkperl/t/util.pl similarity index 100% rename from src/contrib/zkperl/t/util.pl rename to zookeeper-contrib/zookeeper-contrib-zkperl/t/util.pl diff --git a/src/contrib/zkperl/typemap b/zookeeper-contrib/zookeeper-contrib-zkperl/typemap similarity index 100% rename from src/contrib/zkperl/typemap rename to zookeeper-contrib/zookeeper-contrib-zkperl/typemap diff --git a/src/contrib/zkpython/README b/zookeeper-contrib/zookeeper-contrib-zkpython/README similarity index 100% rename from src/contrib/zkpython/README rename to zookeeper-contrib/zookeeper-contrib-zkpython/README diff --git a/src/contrib/zkpython/build.xml b/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml similarity index 100% rename from src/contrib/zkpython/build.xml rename to zookeeper-contrib/zookeeper-contrib-zkpython/build.xml diff --git a/src/contrib/zkpython/ivy.xml b/zookeeper-contrib/zookeeper-contrib-zkpython/ivy.xml similarity index 100% rename from src/contrib/zkpython/ivy.xml rename to zookeeper-contrib/zookeeper-contrib-zkpython/ivy.xml diff --git a/src/contrib/zkpython/src/c/pyzk_docstrings.h b/zookeeper-contrib/zookeeper-contrib-zkpython/src/c/pyzk_docstrings.h similarity index 100% rename from src/contrib/zkpython/src/c/pyzk_docstrings.h rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/c/pyzk_docstrings.h diff --git a/src/contrib/zkpython/src/c/zookeeper.c b/zookeeper-contrib/zookeeper-contrib-zkpython/src/c/zookeeper.c similarity index 100% rename from src/contrib/zkpython/src/c/zookeeper.c rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/c/zookeeper.c diff --git a/src/contrib/zkpython/src/examples/README b/zookeeper-contrib/zookeeper-contrib-zkpython/src/examples/README similarity index 100% rename from src/contrib/zkpython/src/examples/README rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/examples/README diff --git a/src/contrib/zkpython/src/examples/watch_znode_for_changes.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/examples/watch_znode_for_changes.py similarity index 100% rename from src/contrib/zkpython/src/examples/watch_znode_for_changes.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/examples/watch_znode_for_changes.py diff --git a/src/contrib/zkpython/src/python/setup.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py similarity index 100% rename from src/contrib/zkpython/src/python/setup.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py diff --git a/src/contrib/zkpython/src/python/zk.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/zk.py similarity index 100% rename from src/contrib/zkpython/src/python/zk.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/python/zk.py diff --git a/src/contrib/zkpython/src/test/acl_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/acl_test.py similarity index 100% rename from src/contrib/zkpython/src/test/acl_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/acl_test.py diff --git a/src/contrib/zkpython/src/test/async_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/async_test.py similarity index 100% rename from src/contrib/zkpython/src/test/async_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/async_test.py diff --git a/src/contrib/zkpython/src/test/callback_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/callback_test.py similarity index 100% rename from src/contrib/zkpython/src/test/callback_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/callback_test.py diff --git a/src/contrib/zkpython/src/test/clientid_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/clientid_test.py similarity index 100% rename from src/contrib/zkpython/src/test/clientid_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/clientid_test.py diff --git a/src/contrib/zkpython/src/test/close_deadlock_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/close_deadlock_test.py similarity index 100% rename from src/contrib/zkpython/src/test/close_deadlock_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/close_deadlock_test.py diff --git a/src/contrib/zkpython/src/test/connection_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/connection_test.py similarity index 100% rename from src/contrib/zkpython/src/test/connection_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/connection_test.py diff --git a/src/contrib/zkpython/src/test/create_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py similarity index 100% rename from src/contrib/zkpython/src/test/create_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/create_test.py diff --git a/src/contrib/zkpython/src/test/delete_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/delete_test.py similarity index 100% rename from src/contrib/zkpython/src/test/delete_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/delete_test.py diff --git a/src/contrib/zkpython/src/test/exists_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/exists_test.py similarity index 100% rename from src/contrib/zkpython/src/test/exists_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/exists_test.py diff --git a/src/contrib/zkpython/src/test/get_set_test.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py similarity index 100% rename from src/contrib/zkpython/src/test/get_set_test.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/get_set_test.py diff --git a/src/contrib/zkpython/src/test/run_tests.sh b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh similarity index 100% rename from src/contrib/zkpython/src/test/run_tests.sh rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh diff --git a/src/contrib/zkpython/src/test/zkServer.sh b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh similarity index 100% rename from src/contrib/zkpython/src/test/zkServer.sh rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh diff --git a/src/contrib/zkpython/src/test/zktestbase.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zktestbase.py similarity index 100% rename from src/contrib/zkpython/src/test/zktestbase.py rename to zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zktestbase.py diff --git a/src/contrib/zktreeutil/Makefile.am b/zookeeper-contrib/zookeeper-contrib-zktreeutil/Makefile.am similarity index 100% rename from src/contrib/zktreeutil/Makefile.am rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/Makefile.am diff --git a/src/contrib/zktreeutil/README.txt b/zookeeper-contrib/zookeeper-contrib-zktreeutil/README.txt similarity index 100% rename from src/contrib/zktreeutil/README.txt rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/README.txt diff --git a/src/contrib/zktreeutil/build.xml b/zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml similarity index 100% rename from src/contrib/zktreeutil/build.xml rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml diff --git a/src/contrib/zktreeutil/configure.ac b/zookeeper-contrib/zookeeper-contrib-zktreeutil/configure.ac similarity index 100% rename from src/contrib/zktreeutil/configure.ac rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/configure.ac diff --git a/src/contrib/zktreeutil/src/Makefile.am b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/Makefile.am similarity index 100% rename from src/contrib/zktreeutil/src/Makefile.am rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/src/Makefile.am diff --git a/src/contrib/zktreeutil/src/SimpleTree.h b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/SimpleTree.h similarity index 100% rename from src/contrib/zktreeutil/src/SimpleTree.h rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/src/SimpleTree.h diff --git a/src/contrib/zktreeutil/src/ZkAdaptor.cc b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc similarity index 100% rename from src/contrib/zktreeutil/src/ZkAdaptor.cc rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc diff --git a/src/contrib/zktreeutil/src/ZkAdaptor.h b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.h similarity index 100% rename from src/contrib/zktreeutil/src/ZkAdaptor.h rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.h diff --git a/src/contrib/zktreeutil/src/ZkTreeUtil.cc b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.cc similarity index 100% rename from src/contrib/zktreeutil/src/ZkTreeUtil.cc rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.cc diff --git a/src/contrib/zktreeutil/src/ZkTreeUtil.h b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.h similarity index 100% rename from src/contrib/zktreeutil/src/ZkTreeUtil.h rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtil.h diff --git a/src/contrib/zktreeutil/src/ZkTreeUtilMain.cc b/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtilMain.cc similarity index 100% rename from src/contrib/zktreeutil/src/ZkTreeUtilMain.cc rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkTreeUtilMain.cc diff --git a/src/contrib/zktreeutil/tests/zk_sample.xml b/zookeeper-contrib/zookeeper-contrib-zktreeutil/tests/zk_sample.xml similarity index 100% rename from src/contrib/zktreeutil/tests/zk_sample.xml rename to zookeeper-contrib/zookeeper-contrib-zktreeutil/tests/zk_sample.xml diff --git a/src/contrib/zooinspector/NOTICE.txt b/zookeeper-contrib/zookeeper-contrib-zooinspector/NOTICE.txt similarity index 100% rename from src/contrib/zooinspector/NOTICE.txt rename to zookeeper-contrib/zookeeper-contrib-zooinspector/NOTICE.txt diff --git a/src/contrib/zooinspector/README.txt b/zookeeper-contrib/zookeeper-contrib-zooinspector/README.txt similarity index 100% rename from src/contrib/zooinspector/README.txt rename to zookeeper-contrib/zookeeper-contrib-zooinspector/README.txt diff --git a/src/contrib/zooinspector/TODO b/zookeeper-contrib/zookeeper-contrib-zooinspector/TODO similarity index 100% rename from src/contrib/zooinspector/TODO rename to zookeeper-contrib/zookeeper-contrib-zooinspector/TODO diff --git a/src/contrib/zooinspector/build.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml similarity index 98% rename from src/contrib/zooinspector/build.xml rename to zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml index 52f3eb1848d..fb633f7cc14 100644 --- a/src/contrib/zooinspector/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml @@ -40,7 +40,7 @@ - + diff --git a/src/contrib/zooinspector/config/defaultConnectionSettings.cfg b/zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultConnectionSettings.cfg similarity index 100% rename from src/contrib/zooinspector/config/defaultConnectionSettings.cfg rename to zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultConnectionSettings.cfg diff --git a/src/contrib/zooinspector/config/defaultNodeViewers.cfg b/zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultNodeViewers.cfg similarity index 100% rename from src/contrib/zooinspector/config/defaultNodeViewers.cfg rename to zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultNodeViewers.cfg diff --git a/src/contrib/zooinspector/ivy.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/ivy.xml similarity index 100% rename from src/contrib/zooinspector/ivy.xml rename to zookeeper-contrib/zookeeper-contrib-zooinspector/ivy.xml diff --git a/src/contrib/zooinspector/lib/log4j.properties b/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/log4j.properties similarity index 100% rename from src/contrib/zooinspector/lib/log4j.properties rename to zookeeper-contrib/zookeeper-contrib-zooinspector/lib/log4j.properties diff --git a/src/contrib/zooinspector/licences/Apache Software Licence v2.0.txt b/zookeeper-contrib/zookeeper-contrib-zooinspector/licences/Apache Software Licence v2.0.txt similarity index 100% rename from src/contrib/zooinspector/licences/Apache Software Licence v2.0.txt rename to zookeeper-contrib/zookeeper-contrib-zooinspector/licences/Apache Software Licence v2.0.txt diff --git a/src/contrib/zooinspector/src/java/com/nitido/utils/toaster/Toaster.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/com/nitido/utils/toaster/Toaster.java similarity index 100% rename from src/contrib/zooinspector/src/java/com/nitido/utils/toaster/Toaster.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/com/nitido/utils/toaster/Toaster.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodesCache.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodesCache.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodesCache.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodesCache.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java similarity index 100% rename from src/contrib/zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/add.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/add.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/add.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/add.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/document-new.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/document-new.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/document-new.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/document-new.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/document-save.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/document-save.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/document-save.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/document-save.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/down.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/down.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/down.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/down.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-start.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-start.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-start.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-start.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-stop.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-stop.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-stop.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/media-playback-stop.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/remove.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/remove.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/remove.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/remove.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/up.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/up.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/up.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/up.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/view-refresh.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/view-refresh.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/actions/view-refresh.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/actions/view-refresh.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/mimetypes/text-x-generic.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/mimetypes/text-x-generic.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/mimetypes/text-x-generic.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/mimetypes/text-x-generic.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/places/folder.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/places/folder.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/places/folder.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/places/folder.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/places/user-trash.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/places/user-trash.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/places/user-trash.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/places/user-trash.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/status/info.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/status/info.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/16x16/status/info.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/16x16/status/info.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/add.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/add.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/add.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/add.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/document-new.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/document-new.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/document-new.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/document-new.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/document-save.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/document-save.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/document-save.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/document-save.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/down.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/down.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/down.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/down.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-start.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-start.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-start.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-start.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-stop.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-stop.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-stop.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/media-playback-stop.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/remove.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/remove.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/remove.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/remove.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/up.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/up.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/up.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/up.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/view-refresh.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/view-refresh.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/actions/view-refresh.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/actions/view-refresh.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/mimetypes/text-x-generic.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/mimetypes/text-x-generic.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/mimetypes/text-x-generic.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/mimetypes/text-x-generic.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/places/folder.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/places/folder.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/places/folder.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/places/folder.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/places/user-trash.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/places/user-trash.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/places/user-trash.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/places/user-trash.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/status/info.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/status/info.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/22x22/status/info.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/22x22/status/info.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/add.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/add.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/add.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/add.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/document-new.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/document-new.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/document-new.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/document-new.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/document-save.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/document-save.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/document-save.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/document-save.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/down.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/down.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/down.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/down.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-start.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-start.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-start.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-start.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-stop.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-stop.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-stop.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/media-playback-stop.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/remove.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/remove.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/remove.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/remove.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/up.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/up.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/up.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/up.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/view-refresh.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/view-refresh.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/actions/view-refresh.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/actions/view-refresh.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/mimetypes/text-x-generic.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/mimetypes/text-x-generic.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/mimetypes/text-x-generic.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/mimetypes/text-x-generic.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/places/folder.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/places/folder.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/places/folder.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/places/folder.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/places/user-trash.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/places/user-trash.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/places/user-trash.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/places/user-trash.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/status/info.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/status/info.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/24x24/status/info.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/24x24/status/info.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/add.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/add.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/add.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/add.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/document-new.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/document-new.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/document-new.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/document-new.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/document-save.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/document-save.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/document-save.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/document-save.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/down.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/down.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/down.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/down.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-start.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-start.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-start.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-start.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-stop.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-stop.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-stop.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/media-playback-stop.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/remove.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/remove.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/remove.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/remove.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/up.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/up.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/up.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/up.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/view-refresh.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/view-refresh.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/actions/view-refresh.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/actions/view-refresh.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/mimetypes/text-x-generic.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/mimetypes/text-x-generic.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/mimetypes/text-x-generic.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/mimetypes/text-x-generic.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/places/folder.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/places/folder.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/places/folder.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/places/folder.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/places/user-trash.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/places/user-trash.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/places/user-trash.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/places/user-trash.png diff --git a/src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/status/info.png b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/status/info.png similarity index 100% rename from src/contrib/zooinspector/src/main/resources/icons/Tango/32x32/status/info.png rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/icons/Tango/32x32/status/info.png diff --git a/src/contrib/zooinspector/zooInspector-dev.sh b/zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector-dev.sh similarity index 100% rename from src/contrib/zooinspector/zooInspector-dev.sh rename to zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector-dev.sh diff --git a/src/contrib/zooinspector/zooInspector.cmd b/zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector.cmd similarity index 100% rename from src/contrib/zooinspector/zooInspector.cmd rename to zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector.cmd diff --git a/src/contrib/zooinspector/zooInspector.sh b/zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector.sh similarity index 100% rename from src/contrib/zooinspector/zooInspector.sh rename to zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector.sh From 59d9d17d9ddadd5bfe6e37b8c4458b6920aa32eb Mon Sep 17 00:00:00 2001 From: Norbert Kalmar Date: Fri, 20 Jul 2018 16:28:24 +0200 Subject: [PATCH 2/4] ZOOKEEPER-3030 add missing files in dist.dir --- build.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index a813d6f3c63..29090a5c118 100644 --- a/build.xml +++ b/build.xml @@ -872,12 +872,17 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> + + + + + - + @@ -995,7 +1000,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> - + From 9f19ab06a73a3c75bacbe141f7fa469c4f9e4e60 Mon Sep 17 00:00:00 2001 From: Norbert Kalmar Date: Fri, 20 Jul 2018 17:38:40 +0200 Subject: [PATCH 3/4] ZOOKEEPER-3030 fix releaseaudit license missing exclusions --- build.xml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index 29090a5c118..0bc053362d4 100644 --- a/build.xml +++ b/build.xml @@ -1726,8 +1726,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> + + @@ -1739,16 +1741,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> - - - - - - - - - - + + + + + + + + + + From 49b7519bed90a3bc2f87cfe39f77f9e6bcb13f98 Mon Sep 17 00:00:00 2001 From: Norbert Kalmar Date: Mon, 23 Jul 2018 15:36:17 +0200 Subject: [PATCH 4/4] ZOOKEEPER-3030 create maven dir structure --- build.xml | 29 ++++++++++++------ zookeeper-contrib/build-contrib.xml | 2 +- .../zookeeper-contrib-fatjar/build.xml | 4 +-- .../org/apache/zookeeper/util/FatJarMain.java | 0 .../{conf => src/main/resources}/mainClasses | 0 .../zookeeper-contrib-loggraph/README.txt | 3 +- .../zookeeper-contrib-loggraph/build.xml | 4 +-- .../zookeeper/graph/FilterException.java | 0 .../org/apache/zookeeper/graph/FilterOp.java | 0 .../apache/zookeeper/graph/FilterParser.java | 0 .../apache/zookeeper/graph/JsonGenerator.java | 0 .../apache/zookeeper/graph/Log4JEntry.java | 0 .../apache/zookeeper/graph/Log4JSource.java | 0 .../org/apache/zookeeper/graph/LogEntry.java | 0 .../apache/zookeeper/graph/LogIterator.java | 0 .../org/apache/zookeeper/graph/LogServer.java | 0 .../apache/zookeeper/graph/LogSkipList.java | 0 .../org/apache/zookeeper/graph/LogSource.java | 0 .../zookeeper/graph/MeasureThroughput.java | 0 .../zookeeper/graph/MergedLogSource.java | 0 .../graph/RandomAccessFileReader.java | 0 .../zookeeper/graph/TransactionEntry.java | 0 .../apache/zookeeper/graph/TxnLogSource.java | 0 .../zookeeper/graph/filterops/AndOp.java | 0 .../apache/zookeeper/graph/filterops/Arg.java | 0 .../zookeeper/graph/filterops/EqualsOp.java | 0 .../graph/filterops/GreaterThanOp.java | 0 .../zookeeper/graph/filterops/LessThanOp.java | 0 .../zookeeper/graph/filterops/NotOp.java | 0 .../zookeeper/graph/filterops/NumberArg.java | 0 .../zookeeper/graph/filterops/OrOp.java | 0 .../zookeeper/graph/filterops/StringArg.java | 0 .../zookeeper/graph/filterops/SymbolArg.java | 0 .../zookeeper/graph/filterops/XorOp.java | 0 .../zookeeper/graph/servlets/FileLoader.java | 0 .../apache/zookeeper/graph/servlets/Fs.java | 0 .../zookeeper/graph/servlets/GraphData.java | 0 .../zookeeper/graph/servlets/JsonServlet.java | 0 .../zookeeper/graph/servlets/NumEvents.java | 0 .../graph/servlets/StaticContent.java | 0 .../zookeeper/graph/servlets/Throughput.java | 0 .../main/resources}/loggraph-dev.sh | 4 +-- .../{bin => src/main/resources}/loggraph.sh | 4 +-- .../apache/zookeeper/graph/log4j.properties | 0 .../zookeeper/graph/resources/date.format.js | 0 .../apache/zookeeper/graph/resources/g.bar.js | 0 .../apache/zookeeper/graph/resources/g.dot.js | 0 .../zookeeper/graph/resources/g.line.js | 0 .../apache/zookeeper/graph/resources/g.pie.js | 0 .../zookeeper/graph/resources/g.raphael.js | 0 .../zookeeper/graph/resources/load-big.gif | Bin .../apache/zookeeper/graph/resources/load.gif | Bin .../zookeeper/graph/resources/loggraph.css | 0 .../zookeeper/graph/resources/loggraph.js | 0 .../zookeeper/graph/resources/loggraph.log.js | 0 .../graph/resources/loggraph.server.js | 0 .../graph/resources/loggraph.session.js | 0 .../graph/resources/loggraph.stats.js | 0 .../zookeeper/graph/resources/loggraph.ui.js | 0 .../zookeeper/graph/resources/main.html | 0 .../zookeeper/graph/resources/raphael.js | 0 .../zookeeper/graph/resources/yui-min.js | 0 .../zookeeper-contrib-rest/build.xml | 2 +- .../zookeeper/server/jersey/RestMain.java | 0 .../server/jersey/ZooKeeperService.java | 0 .../server/jersey/cfg/Credentials.java | 0 .../zookeeper/server/jersey/cfg/Endpoint.java | 0 .../zookeeper/server/jersey/cfg/HostPort.java | 0 .../server/jersey/cfg/HostPortSet.java | 0 .../zookeeper/server/jersey/cfg/RestCfg.java | 0 .../server/jersey/filters/HTTPBasicAuth.java | 0 .../server/jersey/jaxb/ZChildren.java | 0 .../server/jersey/jaxb/ZChildrenJSON.java | 0 .../zookeeper/server/jersey/jaxb/ZError.java | 0 .../zookeeper/server/jersey/jaxb/ZPath.java | 0 .../server/jersey/jaxb/ZSession.java | 0 .../zookeeper/server/jersey/jaxb/ZStat.java | 0 .../jersey/resources/JAXBContextResolver.java | 0 .../resources/KeeperExceptionMapper.java | 0 .../resources/RuntimeExceptionMapper.java | 0 .../jersey/resources/SessionsResource.java | 0 .../server/jersey/resources/ZErrorWriter.java | 0 .../jersey/resources/ZNodeResource.java | 0 .../apache/zookeeper/server/jersey/Base.java | 0 .../zookeeper/server/jersey/CreateTest.java | 0 .../zookeeper/server/jersey/DeleteTest.java | 0 .../zookeeper/server/jersey/ExistsTest.java | 0 .../server/jersey/GetChildrenTest.java | 0 .../zookeeper/server/jersey/GetTest.java | 0 .../server/jersey/RestTestSuite.java | 0 .../zookeeper/server/jersey/RootTest.java | 0 .../zookeeper/server/jersey/SessionTest.java | 0 .../zookeeper/server/jersey/SetTest.java | 0 .../zookeeper/server/jersey/WadlTest.java | 0 .../zookeeper-contrib-zooinspector/build.xml | 19 +++++++++--- .../com/nitido/utils/toaster/Toaster.java | 0 .../zookeeper/inspector/ZooInspector.java | 0 .../BasicDataEncryptionManager.java | 0 .../encryption/DataEncryptionManager.java | 0 .../zookeeper/inspector/gui/IconResource.java | 0 .../gui/NodeViewersChangeListener.java | 0 .../zookeeper/inspector/gui/Toolbar.java | 0 .../gui/ZooInspectorAboutDialog.java | 0 ...ooInspectorConnectionPropertiesDialog.java | 0 .../gui/ZooInspectorNodeViewersDialog.java | 0 .../gui/ZooInspectorNodeViewersPanel.java | 0 .../inspector/gui/ZooInspectorPanel.java | 0 .../inspector/gui/ZooInspectorTreeViewer.java | 0 .../apache/zookeeper/inspector/gui/about.html | 0 .../inspector/gui/actions/AddNodeAction.java | 0 .../gui/actions/DeleteNodeAction.java | 0 .../gui/nodeviewer/NodeViewerACL.java | 0 .../gui/nodeviewer/NodeViewerData.java | 0 .../gui/nodeviewer/NodeViewerMetaData.java | 0 .../nodeviewer/ZooInspectorNodeViewer.java | 0 .../inspector/logger/LoggerFactory.java | 0 .../inspector/manager/NodeListener.java | 0 .../inspector/manager/NodesCache.java | 0 .../zookeeper/inspector/manager/Pair.java | 0 .../manager/ZooInspectorManager.java | 0 .../manager/ZooInspectorManagerImpl.java | 4 +-- .../manager/ZooInspectorNodeManager.java | 0 .../manager/ZooInspectorNodeTreeManager.java | 0 .../manager/ZooInspectorReadOnlyManager.java | 0 .../zookeeper/retry/ZooKeeperRetry.java | 0 .../resources}/defaultConnectionSettings.cfg | 0 .../main/resources}/defaultNodeViewers.cfg | 0 .../main/resources}/log4j.properties | 0 .../zooInspector-dev.sh | 2 +- 129 files changed, 48 insertions(+), 29 deletions(-) rename zookeeper-contrib/zookeeper-contrib-fatjar/src/{ => main}/java/org/apache/zookeeper/util/FatJarMain.java (100%) rename zookeeper-contrib/zookeeper-contrib-fatjar/{conf => src/main/resources}/mainClasses (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/FilterException.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/FilterOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/FilterParser.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/JsonGenerator.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/Log4JEntry.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/Log4JSource.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/LogEntry.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/LogIterator.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/LogServer.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/LogSkipList.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/LogSource.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/MeasureThroughput.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/MergedLogSource.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/RandomAccessFileReader.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/TransactionEntry.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/TxnLogSource.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/AndOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/Arg.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/EqualsOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/LessThanOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/NotOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/NumberArg.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/OrOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/StringArg.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/SymbolArg.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/filterops/XorOp.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/servlets/FileLoader.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/servlets/Fs.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/servlets/GraphData.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/servlets/JsonServlet.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/servlets/NumEvents.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/servlets/StaticContent.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/src/{ => main}/java/org/apache/zookeeper/graph/servlets/Throughput.java (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{bin => src/main/resources}/loggraph-dev.sh (91%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{bin => src/main/resources}/loggraph.sh (90%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/log4j.properties (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/date.format.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/g.bar.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/g.dot.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/g.line.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/g.pie.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/g.raphael.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/load-big.gif (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/load.gif (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/loggraph.css (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/loggraph.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/loggraph.log.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/loggraph.server.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/loggraph.session.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/loggraph.stats.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/loggraph.ui.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/main.html (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/raphael.js (100%) rename zookeeper-contrib/zookeeper-contrib-loggraph/{web => src/main/webapp}/org/apache/zookeeper/graph/resources/yui-min.js (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/RestMain.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/{ => main}/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/Base.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/CreateTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/DeleteTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/ExistsTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/GetChildrenTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/GetTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/RestTestSuite.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/RootTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/SessionTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/SetTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-rest/src/test/{ => java}/org/apache/zookeeper/server/jersey/WadlTest.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/com/nitido/utils/toaster/Toaster.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/ZooInspector.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/IconResource.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/Toolbar.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/about.html (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/NodeListener.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/NodesCache.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/Pair.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java (99%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/src/{ => main}/java/org/apache/zookeeper/retry/ZooKeeperRetry.java (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/{config => src/main/resources}/defaultConnectionSettings.cfg (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/{config => src/main/resources}/defaultNodeViewers.cfg (100%) rename zookeeper-contrib/zookeeper-contrib-zooinspector/{lib => src/main/resources}/log4j.properties (100%) diff --git a/build.xml b/build.xml index 0bc053362d4..e73b047bb63 100644 --- a/build.xml +++ b/build.xml @@ -1731,7 +1731,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> - + @@ -1741,16 +1741,25 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant"> - - - - - - - - + + + + + + + + + + + + + + + + - + + diff --git a/zookeeper-contrib/build-contrib.xml b/zookeeper-contrib/build-contrib.xml index bab2d4510a0..4b81f8adfc6 100644 --- a/zookeeper-contrib/build-contrib.xml +++ b/zookeeper-contrib/build-contrib.xml @@ -27,7 +27,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml index 8935f3940fe..6f34a9204f6 100644 --- a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml @@ -38,7 +38,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/src/java/org/apache/zookeeper/util/FatJarMain.java b/zookeeper-contrib/zookeeper-contrib-fatjar/src/main/java/org/apache/zookeeper/util/FatJarMain.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-fatjar/src/java/org/apache/zookeeper/util/FatJarMain.java rename to zookeeper-contrib/zookeeper-contrib-fatjar/src/main/java/org/apache/zookeeper/util/FatJarMain.java diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/conf/mainClasses b/zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-fatjar/conf/mainClasses rename to zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/README.txt b/zookeeper-contrib/zookeeper-contrib-loggraph/README.txt index 1865fa5ab0c..8ccaa1ca5b0 100644 --- a/zookeeper-contrib/zookeeper-contrib-loggraph/README.txt +++ b/zookeeper-contrib/zookeeper-contrib-loggraph/README.txt @@ -7,7 +7,8 @@ LogGraph is an application for viewing and filtering zookeeper logs. It can hand Run "ant jar" in src/contrib/loggraph/. This will download all dependencies and compile all the loggraph code. -Once compilation has finished, you can run it the the loggraph.sh script in src/contrib/loggraph/bin. This will start and embedded web server on your machine. +Once compilation has finished, you can run it the the loggraph.sh script in zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources. +This will start and embedded web server on your machine. Navigate to http://localhost:8182/graph/main.html 3 - Usage diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml index 5be6970b64d..11143e7c5a0 100644 --- a/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml @@ -38,7 +38,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterException.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/FilterException.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterException.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/FilterException.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/FilterOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/FilterOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/FilterParser.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/FilterParser.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/JsonGenerator.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/JsonGenerator.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/JsonGenerator.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/JsonGenerator.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JEntry.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JEntry.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JSource.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/Log4JSource.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogEntry.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogEntry.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogEntry.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogEntry.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogIterator.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogIterator.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogServer.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogServer.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogServer.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogServer.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogSkipList.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogSkipList.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogSource.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/LogSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/LogSource.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/MeasureThroughput.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/MeasureThroughput.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/MergedLogSource.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/MergedLogSource.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/RandomAccessFileReader.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/RandomAccessFileReader.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/TransactionEntry.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/TransactionEntry.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/TxnLogSource.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/TxnLogSource.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/AndOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/AndOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/AndOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/AndOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/Arg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/Arg.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/Arg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/Arg.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/EqualsOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/EqualsOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/EqualsOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/EqualsOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/GreaterThanOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/LessThanOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/LessThanOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/LessThanOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/LessThanOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NotOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/NotOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NotOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/NotOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NumberArg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/NumberArg.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/NumberArg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/NumberArg.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/OrOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/OrOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/OrOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/OrOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/StringArg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/StringArg.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/StringArg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/StringArg.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/SymbolArg.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/SymbolArg.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/SymbolArg.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/SymbolArg.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/XorOp.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/XorOp.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/filterops/XorOp.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/filterops/XorOp.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/FileLoader.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/FileLoader.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/Fs.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/Fs.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/GraphData.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/GraphData.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/JsonServlet.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/JsonServlet.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/JsonServlet.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/JsonServlet.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/NumEvents.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/NumEvents.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/StaticContent.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/StaticContent.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/StaticContent.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/StaticContent.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/Throughput.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/java/org/apache/zookeeper/graph/servlets/Throughput.java diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph-dev.sh b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/loggraph-dev.sh similarity index 91% rename from zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph-dev.sh rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/loggraph-dev.sh index 0b82efa35b0..e04434ec53c 100755 --- a/zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph-dev.sh +++ b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/loggraph-dev.sh @@ -20,10 +20,10 @@ make_canonical () { } SCRIPTDIR=`dirname $0` -BUILDDIR=`make_canonical $SCRIPTDIR/../../../../build/contrib/loggraph` +BUILDDIR=`make_canonical $SCRIPTDIR/../../../../../build/contrib/loggraph` LIBDIR=`make_canonical $BUILDDIR/lib` WEBDIR=`make_canonical $SCRIPTDIR/../web` -ZKDIR=`make_canonical $SCRIPTDIR/../../../../build/` +ZKDIR=`make_canonical $SCRIPTDIR/../../../../../build/` if [ ! -x $BUILDDIR ]; then echo "\n\n*** You need to build loggraph before running it ***\n\n"; diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph.sh b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/loggraph.sh similarity index 90% rename from zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph.sh rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/loggraph.sh index 381e5ad478a..0259dc690d6 100755 --- a/zookeeper-contrib/zookeeper-contrib-loggraph/bin/loggraph.sh +++ b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/loggraph.sh @@ -20,9 +20,9 @@ make_canonical () { } SCRIPTDIR=`dirname $0` -BUILDDIR=`make_canonical $SCRIPTDIR/../../../../build/contrib/loggraph` +BUILDDIR=`make_canonical $SCRIPTDIR/../../../../../build/contrib/loggraph` LIBDIR=`make_canonical $BUILDDIR/lib` -ZKDIR=`make_canonical $SCRIPTDIR/../../../../build/` +ZKDIR=`make_canonical $SCRIPTDIR/../../../../../build/` if [ ! -x $BUILDDIR ]; then echo "\n\n*** You need to build loggraph before running it ***\n\n"; diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/log4j.properties b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/log4j.properties similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/log4j.properties rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/log4j.properties diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/date.format.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/date.format.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/date.format.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/date.format.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.bar.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.bar.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.bar.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.bar.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.dot.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.dot.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.dot.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.dot.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.line.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.line.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.line.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.line.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.pie.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.pie.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.pie.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.pie.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.raphael.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/g.raphael.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.raphael.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load-big.gif b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load-big.gif similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load-big.gif rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load-big.gif diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load.gif b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load.gif similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/load.gif rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load.gif diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.css b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.css similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.css rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.css diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.log.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.log.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.log.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.log.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.server.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.server.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.session.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.session.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.session.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.session.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.stats.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.stats.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.stats.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.stats.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.ui.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.ui.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/loggraph.ui.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.ui.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/main.html b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/main.html similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/main.html rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/main.html diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/raphael.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/raphael.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/raphael.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/yui-min.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/yui-min.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/web/org/apache/zookeeper/graph/resources/yui-min.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/yui-min.js diff --git a/zookeeper-contrib/zookeeper-contrib-rest/build.xml b/zookeeper-contrib/zookeeper-contrib-rest/build.xml index 53c805763e7..5097182addb 100644 --- a/zookeeper-contrib/zookeeper-contrib-rest/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-rest/build.xml @@ -21,7 +21,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/RestMain.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/RestMain.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/Credentials.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/Endpoint.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/HostPort.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/HostPortSet.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/cfg/RestCfg.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/filters/HTTPBasicAuth.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZChildren.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZChildrenJSON.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZError.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZPath.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZSession.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/jaxb/ZStat.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/JAXBContextResolver.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/KeeperExceptionMapper.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/RuntimeExceptionMapper.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZErrorWriter.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java b/zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/main/java/org/apache/zookeeper/server/jersey/resources/ZNodeResource.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/Base.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/Base.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/Base.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/Base.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/CreateTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/CreateTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/DeleteTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/DeleteTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/ExistsTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/ExistsTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/GetChildrenTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/GetChildrenTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/GetTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/GetTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RestTestSuite.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/RestTestSuite.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RestTestSuite.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/RestTestSuite.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/RootTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/RootTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/SessionTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/SessionTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/SetTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/SetTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java b/zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/WadlTest.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java rename to zookeeper-contrib/zookeeper-contrib-rest/src/test/java/org/apache/zookeeper/server/jersey/WadlTest.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml index fb633f7cc14..68ea9f7cadc 100644 --- a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml @@ -34,10 +34,13 @@ - + + + + - + @@ -63,8 +66,11 @@ - - + + + + + @@ -133,7 +139,10 @@ - + + + + diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/com/nitido/utils/toaster/Toaster.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/com/nitido/utils/toaster/Toaster.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/ZooInspector.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/ZooInspector.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/IconResource.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/IconResource.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/IconResource.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/Toolbar.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/Toolbar.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/Toolbar.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/about.html similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/about.html diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/actions/AddNodeAction.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/actions/DeleteNodeAction.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/NodeListener.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/NodeListener.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodesCache.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/NodesCache.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodesCache.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/NodesCache.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/Pair.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/Pair.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java similarity index 99% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java index 57cdd95c0e0..2c5790746ad 100644 --- a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java @@ -93,9 +93,9 @@ public class ZooInspectorManagerImpl implements ZooInspectorManager { private static final File defaultNodeViewersFile = new File( - "./config/defaultNodeViewers.cfg"); + "./src/main/resources/defaultNodeViewers.cfg"); private static final File defaultConnectionFile = new File( - "./config/defaultConnectionSettings.cfg"); + "./src/main/resources/defaultConnectionSettings.cfg"); private DataEncryptionManager encryptionManager; private String connectString; diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/retry/ZooKeeperRetry.java similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/retry/ZooKeeperRetry.java diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultConnectionSettings.cfg b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultConnectionSettings.cfg similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultConnectionSettings.cfg rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultConnectionSettings.cfg diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultNodeViewers.cfg b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultNodeViewers.cfg similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/config/defaultNodeViewers.cfg rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultNodeViewers.cfg diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/lib/log4j.properties b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/log4j.properties similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-zooinspector/lib/log4j.properties rename to zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/log4j.properties diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector-dev.sh b/zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector-dev.sh index f507f68487b..9be0b0a238b 100755 --- a/zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector-dev.sh +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/zooInspector-dev.sh @@ -15,4 +15,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -java -cp ../../../build/contrib/ZooInspector/*:../../../build/*:../../../build/lib/*:lib org.apache.zookeeper.inspector.ZooInspector +java -cp ../../build/contrib/ZooInspector/*:../../../build/*:../../../build/lib/*:lib org.apache.zookeeper.inspector.ZooInspector