From 4374e2e88a9260080aa61a454ecca63eba142fe0 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Wed, 13 Dec 2006 19:04:23 +0000
Subject: [PATCH] created internal "subproject"  structure to reuse the
 common-build.xml ant tasks

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@486798 13f79535-47bb-0310-9956-ffa450edef68
---
 contrib/gdata-server/build.xml                | 135 ++++++++----------
 .../gdata-server/gdata-build/gom-build.xml    |  86 -----------
 .../gdata-build/hivemind-build.xml            |  97 -------------
 contrib/gdata-server/src/core/build.xml       |  78 ++++++++++
 .../lucene/gdata/data/GDataAccount.java       |   0
 .../lucene/gdata/data/ServerBaseEntry.java    |   0
 .../lucene/gdata/data/ServerBaseFeed.java     |   0
 .../org/apache/lucene/gdata/data/package.html |   0
 .../java/org/apache/lucene/gdata/package.html |   0
 .../lucene/gdata/search/GDataSearcher.java    |   0
 .../lucene/gdata/search/SearchComponent.java  |   0
 .../gdata/search/StandardGdataSearcher.java   |   0
 .../search/analysis/ContentStrategy.java      |   0
 .../gdata/search/analysis/DomIndexable.java   |   0
 .../analysis/GdataCategoryStrategy.java       |   0
 .../search/analysis/GdataDateStrategy.java    |   0
 .../gdata/search/analysis/HTMLStrategy.java   |   0
 .../gdata/search/analysis/Indexable.java      |   0
 .../search/analysis/KeywordStrategy.java      |   0
 .../search/analysis/MixedContentStrategy.java |   0
 .../analysis/NotIndexableException.java       |   0
 .../search/analysis/PlainTextStrategy.java    |   0
 .../gdata/search/analysis/XHtmlStrategy.java  |   0
 .../lucene/gdata/search/analysis/package.html |   0
 .../gdata/search/config/IndexSchema.java      |   0
 .../gdata/search/config/IndexSchemaField.java |   0
 .../lucene/gdata/search/config/package.html   |   0
 .../search/index/GDataIndexDocument.java      |   0
 .../gdata/search/index/GDataIndexWriter.java  |   0
 .../gdata/search/index/GDataIndexer.java      |   0
 .../search/index/GdataIndexerException.java   |   0
 .../gdata/search/index/IndexAction.java       |   0
 .../gdata/search/index/IndexController.java   |   0
 .../gdata/search/index/IndexDocument.java     |   0
 .../search/index/IndexDocumentBuilder.java    |   0
 .../index/IndexDocumentBuilderTask.java       |   0
 .../search/index/IndexEventListener.java      |   0
 .../search/index/IndexFeedDeleteTask.java     |   0
 .../gdata/search/index/IndexLogReader.java    |   0
 .../gdata/search/index/IndexLogWriter.java    |   0
 .../lucene/gdata/search/index/IndexTask.java  |   0
 .../gdata/search/index/TimedIndexTask.java    |   0
 .../lucene/gdata/search/index/package.html    |   0
 .../apache/lucene/gdata/search/package.html   |   0
 .../gdata/search/query/GDataQueryParser.java  |   0
 .../gdata/search/query/QueryTranslator.java   |   0
 .../gdata/server/FeedNotFoundException.java   |   0
 .../gdata/server/GDataEntityBuilder.java      |   0
 .../lucene/gdata/server/GDataRequest.java     |   0
 .../gdata/server/GDataRequestException.java   |   0
 .../lucene/gdata/server/GDataResponse.java    |   0
 .../gdata/server/GDataSearchService.java      |   0
 .../lucene/gdata/server/GDataService.java     |   0
 .../apache/lucene/gdata/server/Service.java   |   0
 .../lucene/gdata/server/ServiceException.java |   0
 .../lucene/gdata/server/ServiceFactory.java   |   0
 .../server/administration/AccountBuilder.java |   0
 .../server/administration/AdminService.java   |   0
 .../administration/GDataAdminService.java     |   0
 .../gdata/server/administration/package.html  |   0
 .../AuthenticationController.java             |   0
 .../AuthenticationException.java              |   0
 .../AuthenticatorException.java               |   0
 .../BlowfishAuthenticationController.java     |   0
 .../GDataHttpAuthenticator.java               |   0
 .../gdata/server/authentication/package.html  |   0
 .../apache/lucene/gdata/server/package.html   |   0
 .../gdata/server/registry/Component.java      |   0
 .../gdata/server/registry/ComponentType.java  |   0
 .../server/registry/DataBuilderException.java |   0
 .../server/registry/EntryEventListener.java   |   0
 .../server/registry/EntryEventMediator.java   |   0
 .../registry/FeedInstanceConfigurator.java    |   0
 .../server/registry/GDataRequestListener.java |   0
 .../server/registry/GDataServerRegistry.java  |   0
 .../server/registry/ProvidedService.java      |   0
 .../registry/ProvidedServiceConfig.java       |   0
 .../server/registry/RegistryBuilder.java      |   0
 .../registry/RegistryContextListener.java     |   0
 .../server/registry/RegistryException.java    |   0
 .../lucene/gdata/server/registry/Scope.java   |   0
 .../gdata/server/registry/ScopeVisitable.java |   0
 .../gdata/server/registry/ScopeVisitor.java   |   0
 .../server/registry/ServerComponent.java      |   0
 .../gdata/server/registry/SuperType.java      |   0
 .../configuration/ComponentConfiguration.java |   0
 .../configuration/InjectionException.java     |   0
 .../configuration/PropertyInjector.java       |   0
 .../registry/configuration/Requiered.java     |   0
 .../lucene/gdata/server/registry/package.html |   0
 .../gdata/servlet/AbstractGdataServlet.java   |   0
 .../servlet/AccountAdministrationServlet.java |   0
 .../gdata/servlet/AuthenticationServlet.java  |   0
 .../servlet/FeedAdministrationServlet.java    |   0
 .../servlet/RequestControllerServlet.java     |   0
 .../handler/AbstractAccountHandler.java       |   0
 .../servlet/handler/AbstractFeedHandler.java  |   0
 .../handler/AbstractGdataRequestHandler.java  |   0
 .../handler/AuthenticationHandler.java        |   0
 .../servlet/handler/DefaultDeleteHandler.java |   0
 .../servlet/handler/DefaultGetHandler.java    |   0
 .../servlet/handler/DefaultInsertHandler.java |   0
 .../handler/DefaultRequestHandlerFactory.java |   0
 .../servlet/handler/DefaultUpdateHandler.java |   0
 .../handler/DeleteAccountStrategy.java        |   0
 .../servlet/handler/DeleteFeedHandler.java    |   0
 .../servlet/handler/GDataRequestHandler.java  |   0
 .../handler/GDataRequestHandlerException.java |   0
 .../handler/InsertAccountStrategy.java        |   0
 .../servlet/handler/InsertFeedHandler.java    |   0
 .../servlet/handler/RequestAuthenticator.java |   0
 .../handler/RequestHandlerFactory.java        |   0
 .../handler/UpdateAccountStrategy.java        |   0
 .../servlet/handler/UpdateFeedHandler.java    |   0
 .../lucene/gdata/servlet/handler/package.html |   0
 .../apache/lucene/gdata/servlet/package.html  |   0
 .../lucene/gdata/storage/IDGenerator.java     |   0
 .../ModificationConflictException.java        |   0
 .../storage/ResourceNotFoundException.java    |   0
 .../apache/lucene/gdata/storage/Storage.java  |   0
 .../gdata/storage/StorageController.java      |   0
 .../gdata/storage/StorageException.java       |   0
 .../lucene/gdata/storage/StorageFactory.java  |   0
 .../gdata/storage/db4o/DB4oController.java    |   0
 .../gdata/storage/db4o/DB4oStorage.java       |   0
 .../storage/db4o/ObjectServerDecorator.java   |   0
 .../lucene/gdata/storage/db4o/package.html    |   0
 .../lucenestorage/ConcurrentStorageLock.java  |   0
 .../lucenestorage/ModifiedEntryFilter.java    |   0
 .../SingleHostConcurrentStorageLock.java      |   0
 .../lucenestorage/StorageAccountWrapper.java  |   0
 .../storage/lucenestorage/StorageBuffer.java  |   0
 .../lucenestorage/StorageCoreController.java  |   0
 .../lucenestorage/StorageEntryWrapper.java    |   0
 .../lucenestorage/StorageFeedWrapper.java     |   0
 .../lucenestorage/StorageImplementation.java  |   0
 .../lucenestorage/StorageModifier.java        |   0
 .../storage/lucenestorage/StorageQuery.java   |   0
 .../storage/lucenestorage/StorageWrapper.java |   0
 .../configuration/StorageConfigurator.java    |   0
 .../lucenestorage/configuration/package.html  |   0
 .../gdata/storage/lucenestorage/package.html  |   0
 .../recover/RecoverController.java            |   0
 .../recover/RecoverException.java             |   0
 .../lucenestorage/recover/RecoverReader.java  |   0
 .../lucenestorage/recover/RecoverWriter.java  |   0
 .../lucenestorage/recover/package.html        |   0
 .../lucenestorage/util/ReferenceCounter.java  |   0
 .../storage/lucenestorage/util/package.html   |   0
 .../apache/lucene/gdata/storage/package.html  |   0
 .../lucene/gdata/utils/DateFormater.java      |   0
 .../gdata/utils/ModifiedEntryFilter.java      |   0
 .../org/apache/lucene/gdata/utils/Pool.java   |   0
 .../lucene/gdata/utils/PoolObjectFactory.java |   0
 .../lucene/gdata/utils/ReferenceCounter.java  |   0
 .../lucene/gdata/utils/ReflectionUtils.java   |   0
 .../lucene/gdata/utils/SimpleObjectPool.java  |   0
 .../gdata/utils/SimpleSaxErrorHandler.java    |   0
 .../apache/lucene/gdata/utils/package.html    |   0
 .../src/core/{ => src}/test/gdata-account.xsd |   0
 .../src/core/{ => src}/test/gdata-config.xml  |   0
 .../test/lucenestorage.properties.xml         |   0
 .../lucene/gdata/data/TestGDataUser.java      |   0
 .../search/TestStandardGdataSearcher.java     |   0
 .../gdata/search/analysis/IndexableStub.java  |   0
 .../search/analysis/TestContentStrategy.java  |   0
 .../search/analysis/TestDomIndexable.java     |   0
 .../analysis/TestGdataCategoryStrategy.java   |   0
 .../analysis/TestGdataDateStrategy.java       |   0
 .../search/analysis/TestHTMLStrategy.java     |   0
 .../search/analysis/TestKeywordStrategy.java  |   0
 .../search/analysis/TestMixedStrategy.java    |   0
 .../analysis/TestPlainTextStrategy.java       |   0
 .../gdata/search/config/TestIndexSchema.java  |   0
 .../search/config/TestIndexSchemaField.java   |   0
 .../lucene/gdata/search/index/FutureStub.java |   0
 .../gdata/search/index/IndexDocumentStub.java |   0
 .../search/index/IndexEventListenerStub.java  |   0
 .../search/index/TestGdataIndexDocument.java  |   0
 .../search/index/TestGdataIndexWriter.java    |   0
 .../gdata/search/index/TestGdataIndexer.java  |   0
 .../search/index/TestIndexController.java     |   0
 .../search/index/TestIndexLogReader.java      |   0
 .../index/TestindexDocumentBuilderTask.java   |   0
 .../search/query/TestGdataQueryParser.java    |   0
 .../search/query/TestQueryTranslator.java     |   0
 .../lucene/gdata/server/TestGDataRequest.java |   0
 .../gdata/server/TestGDataResponse.java       |   0
 .../administration/TestAccountBuilder.java    |   0
 .../TestBlowfishAuthenticationController.java |   0
 .../TestEntityBuilderIncomingEntry.xml        |   0
 .../TestEntityBuilderIncomingFeed.xml         |   0
 .../server/registry/TestFeedRegistry.java     |   0
 .../registry/TestGDataEntityBuilder.java      |   0
 .../registry/TestProvidedServiceConfig.java   |   0
 .../configuration/TestConfigurationBean.java  |   0
 .../configuration/TestPropertyInjector.java   |   0
 .../servlet/TestAbstractGdataServlet.java     |   0
 .../handler/TestAbstractFeedHandler.java      |   0
 .../handler/TestRequestAuthenticator.java     |   0
 .../lucene/gdata/storage/TestIDGenerator.java |   0
 .../gdata/storage/db4o/TestDb4oStorage.java   |   0
 .../db4o/TestObjectServerDecorator.java       |   0
 .../StorageCoreControllerStub.java            |   0
 .../lucenestorage/StorageModifierStub.java    |   0
 .../lucenestorage/StorageQueryStub.java       |   0
 .../TestModifiedEntryFilter.java              |   0
 .../TestSingelHostConcurrencyLock.java        |   0
 .../lucenestorage/TestStorageBuffer.java      |   0
 .../TestStorageImplementation.java            |   0
 .../lucenestorage/TestStorageModifier.java    |   0
 .../lucenestorage/TestStorageQuery.java       |   0
 .../recover/TestRecoverController.java        |   0
 .../recover/TestRecoverWriter.java            |   0
 .../recover/TestRevocerReader.java            |   0
 .../utils/AuthenticationContorllerStub.java   |   0
 .../gdata/utils/MultiThreadEntryStub.java     |   0
 .../gdata/utils/ProvidedServiceStub.java      |   0
 .../gdata/utils/ServiceFactoryStub.java       |   0
 .../gdata/utils/StorageControllerStub.java    |   0
 .../lucene/gdata/utils/StorageStub.java       |   0
 .../lucene/gdata/utils/TestDateFormater.java  |   0
 .../gdata/utils/TestReflectionUtils.java      |   0
 .../gdata/utils/TestSimpleObjectPool.java     |   0
 .../apache/lucene/gdata/utils/Visitor.java    |   0
 .../ioc-container.xml => src/gom/build.xml}   |  20 ++-
 .../lucene/gdata/gom/AtomMediaType.java       |   0
 .../apache/lucene/gdata/gom/ContentType.java  |   0
 .../apache/lucene/gdata/gom/GOMAttribute.java |   0
 .../apache/lucene/gdata/gom/GOMAuthor.java    |   0
 .../apache/lucene/gdata/gom/GOMCategory.java  |   0
 .../apache/lucene/gdata/gom/GOMContent.java   |   0
 .../lucene/gdata/gom/GOMContributor.java      |   0
 .../lucene/gdata/gom/GOMDateConstruct.java    |   0
 .../apache/lucene/gdata/gom/GOMDocument.java  |   0
 .../apache/lucene/gdata/gom/GOMElement.java   |   0
 .../org/apache/lucene/gdata/gom/GOMEntry.java |   0
 .../lucene/gdata/gom/GOMExtensible.java       |   0
 .../apache/lucene/gdata/gom/GOMExtension.java |   0
 .../org/apache/lucene/gdata/gom/GOMFeed.java  |   0
 .../apache/lucene/gdata/gom/GOMGenerator.java |   0
 .../org/apache/lucene/gdata/gom/GOMIcon.java  |   0
 .../org/apache/lucene/gdata/gom/GOMId.java    |   0
 .../org/apache/lucene/gdata/gom/GOMLink.java  |   0
 .../org/apache/lucene/gdata/gom/GOMLogo.java  |   0
 .../apache/lucene/gdata/gom/GOMNamespace.java |   0
 .../apache/lucene/gdata/gom/GOMPerson.java    |   0
 .../apache/lucene/gdata/gom/GOMPublished.java |   0
 .../apache/lucene/gdata/gom/GOMRights.java    |   0
 .../apache/lucene/gdata/gom/GOMSource.java    |   0
 .../apache/lucene/gdata/gom/GOMSubtitle.java  |   0
 .../apache/lucene/gdata/gom/GOMSummary.java   |   0
 .../lucene/gdata/gom/GOMTextConstruct.java    |   0
 .../org/apache/lucene/gdata/gom/GOMTime.java  |   0
 .../org/apache/lucene/gdata/gom/GOMTitle.java |   0
 .../apache/lucene/gdata/gom/GOMUpdated.java   |   0
 .../apache/lucene/gdata/gom/GOMXmlEntity.java |   0
 .../gdata/gom/core/AbstractGOMElement.java    |   0
 .../gdata/gom/core/ArbitraryGOMXml.java       |   0
 .../lucene/gdata/gom/core/AtomParser.java     |   0
 .../lucene/gdata/gom/core/AtomUriElement.java |   0
 .../gdata/gom/core/GDataParseException.java   |   0
 .../gdata/gom/core/GOMAttributeImpl.java      |   0
 .../lucene/gdata/gom/core/GOMAuthorImpl.java  |   0
 .../lucene/gdata/gom/core/GOMBuilder.java     |   0
 .../gdata/gom/core/GOMCategoryImpl.java       |   0
 .../lucene/gdata/gom/core/GOMContentImpl.java |   0
 .../gdata/gom/core/GOMContributorImpl.java    |   0
 .../gdata/gom/core/GOMDateConstructImpl.java  |   0
 .../gdata/gom/core/GOMDocumentImpl.java       |   0
 .../lucene/gdata/gom/core/GOMEntryImpl.java   |   0
 .../lucene/gdata/gom/core/GOMFactory.java     |   0
 .../lucene/gdata/gom/core/GOMFeedImpl.java    |   0
 .../gdata/gom/core/GOMGeneratorImpl.java      |   0
 .../lucene/gdata/gom/core/GOMIconImpl.java    |   0
 .../lucene/gdata/gom/core/GOMIdImpl.java      |   0
 .../lucene/gdata/gom/core/GOMLinkImpl.java    |   0
 .../lucene/gdata/gom/core/GOMLogoImpl.java    |   0
 .../lucene/gdata/gom/core/GOMPersonImpl.java  |   0
 .../gdata/gom/core/GOMPublishedImpl.java      |   0
 .../lucene/gdata/gom/core/GOMRightsImpl.java  |   0
 .../lucene/gdata/gom/core/GOMSourceImpl.java  |   0
 .../gdata/gom/core/GOMSubtitleImpl.java       |   0
 .../lucene/gdata/gom/core/GOMSummaryImpl.java |   0
 .../gdata/gom/core/GOMTextContructImpl.java   |   0
 .../lucene/gdata/gom/core/GOMTitleImpl.java   |   0
 .../lucene/gdata/gom/core/GOMUpdatedImpl.java |   0
 .../gdata/gom/core/SimpleElementParser.java   |   0
 .../gdata/gom/core/SimpleGOMElementImpl.java  |   0
 .../apache/lucene/gdata/gom/core/core-aid.gif | Bin
 .../apache/lucene/gdata/gom/core/core-aid.ucd |   0
 .../apache/lucene/gdata/gom/core/core-aid.uml |   0
 .../core/extension/GOMExtensionFactory.java   |   0
 .../gdata/gom/core/utils/AtomParserUtils.java |   0
 .../lucene/gdata/gom/core/utils/GOMUtils.java |   0
 .../gdata/gom/writer/GOMOutputWriter.java     |   0
 .../gdata/gom/writer/GOMStaxWriter.java       |   0
 .../gdata/gom/writer/GOMXmlOutputFactory.java |   0
 .../lucene/gdata/gom/writer/GOMXmlWriter.java |   0
 .../lucene/gdata/gom/GOMNamespaceTest.java    |   0
 .../gdata/gom/core/ArbitraryGOMXmlTest.java   |   0
 .../gdata/gom/core/AtomUriElementTest.java    |   0
 .../gdata/gom/core/GOMAttributeImplTest.java  |   0
 .../gdata/gom/core/GOMAuthorImplTest.java     |   0
 .../gdata/gom/core/GOMCategoryTest.java       |   0
 .../gdata/gom/core/GOMContentImplTest.java    |   0
 .../gom/core/GOMDateConstructImplTest.java    |   0
 .../gdata/gom/core/GOMDocumentImplTest.java   |   0
 .../gdata/gom/core/GOMEntryImplTest.java      |   0
 .../gdata/gom/core/GOMFeedImplTest.java       |   0
 .../gdata/gom/core/GOMGenereatorImplTest.java |   0
 .../lucene/gdata/gom/core/GOMIdImplTest.java  |   0
 .../gdata/gom/core/GOMLinkImplTest.java       |   0
 .../gdata/gom/core/GOMPersonImplTest.java     |   0
 .../gdata/gom/core/GOMSourceImplTest.java     |   0
 .../gom/core/GOMTextConstructImplTest.java    |   0
 .../gom/core/SimpleGOMElementImplTest.java    |   0
 contrib/gdata-server/src/hivemind/build.xml   |  42 ++++++
 .../servlet/HessianServiceServlet.java        |   0
 .../HessianServiceSkeletonInvoker.java        |   0
 .../HessianServiceSkeletonInvokerImpl.java    |   0
 .../webservice/HessianSkeletonProvider.java   |   0
 .../HessianSkeletonProviderImpl.java          |   0
 .../webservice/NoSuchServiceException.java    |   0
 .../webservice/WebserviceMappingBean.java     |   0
 .../HessianSkeletonProviderImplTest.java      |   0
 326 files changed, 192 insertions(+), 266 deletions(-)
 delete mode 100644 contrib/gdata-server/gdata-build/gom-build.xml
 delete mode 100644 contrib/gdata-server/gdata-build/hivemind-build.xml
 create mode 100644 contrib/gdata-server/src/core/build.xml
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/data/GDataAccount.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/data/ServerBaseEntry.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/data/ServerBaseFeed.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/data/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/GDataSearcher.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/SearchComponent.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/StandardGdataSearcher.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/ContentStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/DomIndexable.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/GdataCategoryStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/GdataDateStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/HTMLStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/Indexable.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/KeywordStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/MixedContentStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/NotIndexableException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/PlainTextStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/XHtmlStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/analysis/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/config/IndexSchema.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/config/IndexSchemaField.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/config/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/GDataIndexDocument.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/GDataIndexWriter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/GDataIndexer.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/GdataIndexerException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexAction.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexDocument.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilder.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilderTask.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexEventListener.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexFeedDeleteTask.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexLogReader.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexLogWriter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/IndexTask.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/TimedIndexTask.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/index/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/query/GDataQueryParser.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/search/query/QueryTranslator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/FeedNotFoundException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/GDataEntityBuilder.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/GDataRequest.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/GDataRequestException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/GDataResponse.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/GDataSearchService.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/GDataService.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/Service.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/ServiceException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/ServiceFactory.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/administration/AccountBuilder.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/administration/AdminService.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/administration/GDataAdminService.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/administration/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/authentication/AuthenticationController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/authentication/AuthenticationException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/authentication/AuthenticatorException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/authentication/BlowfishAuthenticationController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/authentication/GDataHttpAuthenticator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/authentication/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/Component.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/ComponentType.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/DataBuilderException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/EntryEventListener.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/EntryEventMediator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/FeedInstanceConfigurator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/GDataRequestListener.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/GDataServerRegistry.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/ProvidedService.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/ProvidedServiceConfig.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/RegistryBuilder.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/RegistryContextListener.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/RegistryException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/Scope.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/ScopeVisitable.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/ScopeVisitor.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/ServerComponent.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/SuperType.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/configuration/ComponentConfiguration.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/configuration/InjectionException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/configuration/PropertyInjector.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/configuration/Requiered.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/server/registry/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/AbstractGdataServlet.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/AccountAdministrationServlet.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/AuthenticationServlet.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/FeedAdministrationServlet.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/RequestControllerServlet.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/AbstractAccountHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/AbstractFeedHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/AbstractGdataRequestHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/AuthenticationHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/DefaultDeleteHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/DefaultGetHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/DefaultInsertHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/DefaultRequestHandlerFactory.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/DefaultUpdateHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/DeleteAccountStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/DeleteFeedHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandlerException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/InsertAccountStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/InsertFeedHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/RequestAuthenticator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/RequestHandlerFactory.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/UpdateAccountStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/UpdateFeedHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/handler/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/servlet/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/IDGenerator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/ModificationConflictException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/ResourceNotFoundException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/Storage.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/StorageController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/StorageException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/StorageFactory.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/db4o/DB4oController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/db4o/DB4oStorage.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/db4o/ObjectServerDecorator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/db4o/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/ConcurrentStorageLock.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/ModifiedEntryFilter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/SingleHostConcurrentStorageLock.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageAccountWrapper.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageBuffer.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageEntryWrapper.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageFeedWrapper.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageImplementation.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageModifier.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageQuery.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/StorageWrapper.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/StorageConfigurator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverException.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverReader.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverWriter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/recover/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/util/ReferenceCounter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/lucenestorage/util/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/storage/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/DateFormater.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/ModifiedEntryFilter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/Pool.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/PoolObjectFactory.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/ReferenceCounter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/ReflectionUtils.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/SimpleObjectPool.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/SimpleSaxErrorHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/java/org/apache/lucene/gdata/utils/package.html (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/gdata-account.xsd (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/gdata-config.xml (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/lucenestorage.properties.xml (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/data/TestGDataUser.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/TestStandardGdataSearcher.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/IndexableStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestContentStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestDomIndexable.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestGdataCategoryStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestGdataDateStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestHTMLStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestKeywordStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestMixedStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/analysis/TestPlainTextStrategy.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/config/TestIndexSchema.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/config/TestIndexSchemaField.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/FutureStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/IndexDocumentStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/IndexEventListenerStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/TestGdataIndexDocument.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/TestGdataIndexWriter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/TestGdataIndexer.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/TestIndexController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/TestIndexLogReader.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/index/TestindexDocumentBuilderTask.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/query/TestGdataQueryParser.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/search/query/TestQueryTranslator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/TestGDataRequest.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/TestGDataResponse.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/administration/TestAccountBuilder.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/authentication/TestBlowfishAuthenticationController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingEntry.xml (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingFeed.xml (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/registry/TestFeedRegistry.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/registry/TestGDataEntityBuilder.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/registry/TestProvidedServiceConfig.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/registry/configuration/TestConfigurationBean.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/server/registry/configuration/TestPropertyInjector.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/servlet/TestAbstractGdataServlet.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/servlet/handler/TestAbstractFeedHandler.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/servlet/handler/TestRequestAuthenticator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/TestIDGenerator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/db4o/TestDb4oStorage.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/db4o/TestObjectServerDecorator.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreControllerStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/StorageModifierStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/StorageQueryStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/TestModifiedEntryFilter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/TestSingelHostConcurrencyLock.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageBuffer.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageImplementation.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageModifier.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageQuery.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverController.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverWriter.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRevocerReader.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/AuthenticationContorllerStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/MultiThreadEntryStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/ProvidedServiceStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/ServiceFactoryStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/StorageControllerStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/StorageStub.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/TestDateFormater.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/TestReflectionUtils.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/TestSimpleObjectPool.java (100%)
 rename contrib/gdata-server/src/core/{ => src}/test/org/apache/lucene/gdata/utils/Visitor.java (100%)
 rename contrib/gdata-server/{gdata-build/ioc-container.xml => src/gom/build.xml} (56%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/AtomMediaType.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/ContentType.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMAttribute.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMAuthor.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMCategory.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMContent.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMContributor.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMDateConstruct.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMDocument.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMElement.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMEntry.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMExtensible.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMExtension.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMFeed.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMGenerator.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMIcon.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMId.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMLink.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMLogo.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMNamespace.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMPerson.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMPublished.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMRights.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMSource.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMSubtitle.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMSummary.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMTextConstruct.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMTime.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMTitle.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMUpdated.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/GOMXmlEntity.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/AbstractGOMElement.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/ArbitraryGOMXml.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/AtomParser.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/AtomUriElement.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GDataParseException.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMAttributeImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMAuthorImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMBuilder.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMCategoryImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMContentImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMContributorImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMDateConstructImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMDocumentImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMEntryImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMFactory.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMFeedImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMGeneratorImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMIconImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMIdImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMLinkImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMLogoImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMPersonImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMPublishedImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMRightsImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMSourceImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMSubtitleImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMSummaryImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMTextContructImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMTitleImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/GOMUpdatedImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/SimpleElementParser.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/SimpleGOMElementImpl.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/core-aid.gif (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/core-aid.ucd (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/core-aid.uml (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/extension/GOMExtensionFactory.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/utils/AtomParserUtils.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/core/utils/GOMUtils.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/writer/GOMOutputWriter.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/writer/GOMStaxWriter.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/writer/GOMXmlOutputFactory.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/java/org/apache/lucene/gdata/gom/writer/GOMXmlWriter.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/GOMNamespaceTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/ArbitraryGOMXmlTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/AtomUriElementTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMAttributeImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMAuthorImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMCategoryTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMContentImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMDateConstructImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMDocumentImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMEntryImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMFeedImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMGenereatorImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMIdImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMLinkImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMPersonImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMSourceImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/GOMTextConstructImplTest.java (100%)
 rename contrib/gdata-server/src/gom/{ => src}/test/org/apache/lucene/gdata/gom/core/SimpleGOMElementImplTest.java (100%)
 create mode 100644 contrib/gdata-server/src/hivemind/build.xml
 rename contrib/gdata-server/src/hivemind/{ => src}/java/org/apache/lucene/gdata/hivemind/servlet/HessianServiceServlet.java (100%)
 rename contrib/gdata-server/src/hivemind/{ => src}/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvoker.java (100%)
 rename contrib/gdata-server/src/hivemind/{ => src}/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvokerImpl.java (100%)
 rename contrib/gdata-server/src/hivemind/{ => src}/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProvider.java (100%)
 rename contrib/gdata-server/src/hivemind/{ => src}/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImpl.java (100%)
 rename contrib/gdata-server/src/hivemind/{ => src}/java/org/apache/lucene/gdata/hivemind/webservice/NoSuchServiceException.java (100%)
 rename contrib/gdata-server/src/hivemind/{ => src}/java/org/apache/lucene/gdata/hivemind/webservice/WebserviceMappingBean.java (100%)
 rename contrib/gdata-server/src/hivemind/{ => src}/test/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImplTest.java (100%)

diff --git a/contrib/gdata-server/build.xml b/contrib/gdata-server/build.xml
index 462f808dd72..d568e4fc7a2 100644
--- a/contrib/gdata-server/build.xml
+++ b/contrib/gdata-server/build.xml
@@ -17,40 +17,51 @@
  
 -->
 
-<project name="gdata-server" default="default">
+<project name="gdata-server" default="compile-core">
 	<description>  
         Serverside Google Data API implementation  
     </description>
 	<import file="gdata-build/get-dependencies.xml" />
-	<import file="gdata-build/ioc-container.xml" />
-	<import file="gdata-build/gom-build.xml" />
 	<property name="javac.source" value="1.5" />
 	<property name="javac.target" value="1.5" />
-	<property name="gdata.war.name" value="gdata-server" />
+
 	<property name="gdata.lib.dir" value="lib" />
 	<property name="gdata.external.lib.dir" value="./ext-libs" />
-	<property name="db4o.jar" value="db4o-5.2-java5.jar" />
+	<property name="db4o.jar" value="db4o-5.5-java5.jar" />
+	<!-- properties for war task -->
+	<property name="ioc.descriptors.dir" value="./src/hivemind/descriptor" />
+	<property name="ioc.descriptors.excludes" value="" />
+	<property name="ioc.descriptors.includes" value="**/*.xml" />
+	
+	<property name="gdata.war.name" value="gdata-server" />
+	
+	<property name="jar.name.core" value="lucene-core-${version}" />
+	<property name="jar.name.gom" value="lucene-gom-${version}" />
+	<property name="jar.name.hivemind" value="lucene-hivemind-${version}" />
+
+	<fileset id="hivemind.jars" dir="${gdata.external.lib.dir}">
+		<include name="hivemind-1.1.jar" />
+		<include name="hivemind-jmx-1.1.jar" />
+		<include name="hivemind-lib-1.1.jar" />
+		<include name="javassist-3.0.jar" />
+		<include name="oro-2.0.6.jar" />
+		<include name="hessian-3.0.20.jar" />
+	</fileset>
+
+	<fileset id="gom.jars" dir="${gdata.external.lib.dir}">
+		<include name="stax-1.1.2-dev.jar" />
+		<include name="stax-api-1.0.1.jar" />
+	</fileset>
+
+
 	<!-- set property for third party jars -->
-	<available property="db4o.jar.present" type="file" file="${gdata.lib.dir}/${db4o.jar}" value="test" />
+	<available property="db4o.jar.present" type="file" file="${gdata.external.lib.dir}/${db4o.jar}" value="test" />
 	<condition property="junit.excludes" value="**/db4o/**/*.java">
 		<not>
 			<isset property="db4o.jar.present" />
 		</not>
 	</condition>
-	<path id="additional.dependencies">
-		<fileset dir="${gdata.lib.dir}">
-			<include name="servlet-api.jar" />
-			<include name="commons-logging-1.1.jar" />
-			<include name="gdata-client-1.0.jar" />
-			<include name="commons-digester-1.7.jar" />
-			<include name="commons-beanutils.jar" />
-			<include name="commons-collections-3.2.jar" />
-			<include name="nekohtml.jar" />
-			<include name="xercesImpl.jar" />
-			<include name="${db4o.jar}" if="db4o.jar.present" />
-		</fileset>
-	</path>
-	
+
 	<condition property="do.download">
 		<not>
 			<and>
@@ -65,74 +76,40 @@
 			</and>
 		</not>
 	</condition>
+	<target name="jar-core" description="Packages the JAR file">
+		<ant dir="src/core" target="jar-core" inheritRefs="true" />
+		<ant dir="src/hivemind" target="jar-core" inheritRefs="true" />
+		<ant dir="src/gom" target="jar-core" inheritRefs="true" />
+	</target>
 
 
-	<!-- redefine compile-core and compile-test to exclude 3rd party dependend sources -->
-	<target name="compile-core" depends="init, download">
-		<echo>Use gdata - compile-core task </echo>
-		<compile srcdir="src/core/java" destdir="${build.dir}/classes/java">
-			<classpath>
-				<path refid="classpath"/>
-				<path refid="build.path"/>
-			</classpath>
-			<exclude name="org/apache/lucene/gdata/storage/db4o/**" unless="db4o.jar.present" />
-		</compile>
-		<antcall target="compile-IoC-container"/>
-		<antcall target="compile-gom"/>
+	<target name="test">
+		<ant dir="src/core" target="test" inheritRefs="true" />
+		<ant dir="src/gom" target="test" inheritRefs="true" />
+		<ant dir="src/hivemind" target="test" inheritRefs="true" />
+	</target>
+	
+	<target name="compile-core" depends="download">
+		<ant dir="src/core" target="compile-core" inheritRefs="true" />
+		<ant dir="src/hivemind" target="compile-core" inheritRefs="true" />
+		<ant dir="src/gom" target="compile-core" inheritRefs="true" />
 	</target>
 
 	<target name="compile-test" depends="compile-core, download">
-		<echo>Use gdata - compile-test task </echo>
-		<compile srcdir="src/core/test" destdir="${build.dir}/classes/test">
-			<classpath>
-				<path refid="test.build.path"/>
-				<path refid="test.classpath"/>
-			</classpath>
-			<exclude name="org/apache/lucene/gdata/storage/db4o/**" unless="db4o.jar.present" />
-		</compile>
-		<copy todir="${build.dir}/classes/core/test">
-			<fileset dir="src/test" excludes="**/*.java" />
-		</copy>
-		<antcall target="compile-IoC-container-test"/>
-		<antcall target="compile-gom-test"/>
+		<ant dir="src/core" target="compile-test" inheritRefs="true" />
+		<ant dir="src/hivemind" target="compile-test" inheritRefs="true" />
+		<ant dir="src/gom" target="compile-test" inheritRefs="true" />
 	</target>
 
-	<pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
-	<import file="../contrib-build.xml" />
-
-	<target name="prepare-dist" depends="jar-core,jar-IoC-container,jar-gom">
-		<echo>Prepare dist directory</echo>
-		<delete dir="${dist.dir}" />
-		<mkdir dir="${dist.dir}" />
+	<target name="clean">
+		<ant dir="src/core" target="clean" inheritRefs="true" />
+		<ant dir="src/hivemind" target="clean" inheritRefs="true" />
+		<ant dir="src/gom" target="clean" inheritRefs="true" />
 	</target>
 
-	<target name="war-gdata" depends="prepare-dist,download">
-		<echo>Distributing GData War </echo>
-		<war destfile="${dist.dir}/${gdata.war.name}.war" webxml="webroot/WEB-INF/web.xml">
-			<metainf dir="webroot/meta-inf" />
-			<fileset dir="webroot" defaultexcludes="true">
-				<exclude name="meta-inf/context.xml" />
-				<exclude name="meta-inf/" />
-				<exclude name="WEB-INF/web.xml" />
-			</fileset>
-			<fileset dir="${ioc.descriptors.dir}" excludes="${ioc.descriptors.excludes}" includes="${ioc.descriptors.includes}"/>
-			<lib dir="${gdata.lib.dir}">
-				<include name="commons-logging-1.1.jar" />
-				<include name="gdata-client-1.0.jar" />
-				<include name="commons-digester-1.7.jar" />
-				<include name="commons-beanutils.jar" />
-				<include name="commons-collections-3.2.jar" />
-				<include name="nekohtml.jar" />
-				<include name="xercesImpl.jar" />
-				<include name="${db4o.jar}" if="db4o.jar.present" />
-			</lib>
-			<lib refid="ioc-container-jars"/>
-			<lib refid="gom-jars"/>
-			<lib dir="${build.dir}" includes="${final.name}.jar" />
-			<lib dir="${build.dir}" includes="${final.name}${ioc.container.jar.suffix}" />
-			<lib dir="${build.dir}" includes="${final.name}${gom.jar.suffix}" />
-			<lib file="${lucene.jar}" />
-		</war>
+	<target name="war-gdata" depends="clean,jar-core">
+		<ant dir="src/core" target="war-gdata" inheritRefs="true" />
 	</target>
 
+
 </project>
\ No newline at end of file
diff --git a/contrib/gdata-server/gdata-build/gom-build.xml b/contrib/gdata-server/gdata-build/gom-build.xml
deleted file mode 100644
index d00ac017c92..00000000000
--- a/contrib/gdata-server/gdata-build/gom-build.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
--->
-<project name="gdata-server-gom" >
-<property name="gom.jar.suffix" value="-gom.jar"/>
-	<description>  
-       Compiles and Jars the gom dependencies for gdata-server
-    </description>
-    <target name="prepare-gom">
-    	<available file="${build.dir}/${final.name}.jar" property="gdata.core.jar.present"/>
-		<fail if="${gdata.core.jar.present}" message="Must gdata core jar first. run build.xml - 'jar-core' task"/>
-		<path id="gom.build.path">
-	    	<fileset id="gom-jars" dir="${gdata.external.lib.dir}">
-	   			<include name="stax-1.1.2-dev.jar"/>
-	   			<include name="stax-api-1.0.1.jar"/>
-	   		</fileset>
-		</path>
-    	<path id="gom.test.path">
-    		<pathelement location="${build.dir}/classes/gom/java"/>
-    	</path>
-	</target>
-	
-	
-	<target name="compile-gom" depends="prepare-gom">
-		<echo>Compile GData object model classes</echo>
-		<compile srcdir="src/gom/java" destdir="${build.dir}/classes/gom/java">
-			<classpath>
-				<path refid="gom.build.path"/>				
-			</classpath>
-		</compile>
-	</target>
-	
-	<target name="compile-gom-test" depends="compile-gom">
-		<echo>Compile GData object model test classes </echo>
-		<compile srcdir="src/gom/test" destdir="${build.dir}/classes/test">
-			<classpath>
-				<path refid="test.build.path"/>
-				<path refid="gom.test.path"/>
-				<path refid="gom.build.path"/>		
-			</classpath>
-		</compile>
-		<copy todir="${build.dir}/classes/test">
-			<fileset dir="src/gom/test" excludes="**/*.java" />
-		</copy>
-	</target>
-	
-
-	<target name="jar-gom" depends="compile-gom">
-		<echo>Jar GOM classes and metadata</echo>
-		<jar
-	      destfile="${build.dir}/${final.name}${gom.jar.suffix}"
-	      basedir="${build.dir}/classes/gom/java">
-	      <manifest>
-	        <attribute name="Created-By" value="Apache Jakarta"/>
-	        <section name="org/apache/lucene/">
-	            <attribute name="Specification-Title" value="Lucene GData Object Model"/>
-	   	          <attribute name="Specification-Version" value="${version}"/>
-	   	          <attribute name="Specification-Vendor" value="Lucene GData Server"/>
-	   	          <attribute name="Implementation-Title" value="org.apache.lucene.gdata"/>
-	   	          <attribute name="Implementation-Version" value="build ${DSTAMP}"/>
-	   	          <attribute name="Implementation-Vendor" value="Lucene"/>
-	        </section>
-	      </manifest>
-	    </jar>
-	</target>
-	
-	
-	
-
-
-</project>
\ No newline at end of file
diff --git a/contrib/gdata-server/gdata-build/hivemind-build.xml b/contrib/gdata-server/gdata-build/hivemind-build.xml
deleted file mode 100644
index f8ba819fe78..00000000000
--- a/contrib/gdata-server/gdata-build/hivemind-build.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- 
--->
-<project name="gdata-server-hivemind" >
-<property name="ioc.container.jar.suffix" value="-hivemind.jar"/>
-<property name="ioc.descriptors.dir" value="./src/hivemind/descriptor"/>
-<property name="ioc.descriptors.excludes" value=""/>
-<property name="ioc.descriptors.includes" value="**/*.xml"/>
-	<description>  
-       Compiles and Jars the hivemind dependencies for gdata-server
-    </description>
-    <target name="prepare-IoC-container">
-    	<available file="${build.dir}/${final.name}.jar" property="gdata.core.jar.present"/>
-		<fail if="${gdata.core.jar.present}" message="Must gdata core jar first. run build.xml - 'jar-core' task"/>
-		<path id="IoC.container.build.path">
-	    	<fileset dir="${build.dir}">
-	   			<include name="${final.name}.jar"/>
-	   		</fileset>
-		</path>
-    	<path id="IoC.container.test.path">
-    		<pathelement location="${build.dir}/classes/hivemind/java"/>
-    	</path>
-    	<fileset id="ioc-container-jars" dir="${gdata.external.lib.dir}">
-			<include name="hivemind-1.1.jar" />
-			<include name="hivemind-jmx-1.1.jar" />
-			<include name="hivemind-lib-1.1.jar" />				
-			<include name="javassist-3.0.jar"/>
-			<include name="oro-2.0.6.jar"/>
-			<include name="hessian-3.0.20.jar"/>
-   		</fileset>
-	</target>
-	<!-- redefine compile-core and compile-test to exclude 3rd party dependend sources -->
-	<target name="compile-IoC-container" depends="prepare-IoC-container">
-		<echo>Compile IoC Container classes</echo>
-		<compile srcdir="src/hivemind/java" destdir="${build.dir}/classes/hivemind/java">
-			<classpath>
-				<path refid="classpath"/>
-				<path refid="build.path"/>
-				<path refid="IoC.container.build.path"/>				
-			</classpath>
-		</compile>
-	</target>
-	
-	<target name="compile-IoC-container-test" depends="compile-IoC-container">
-		<echo>Compile IoC Container test classes </echo>
-		<compile srcdir="src/hivemind/test" destdir="${build.dir}/classes/test">
-			<classpath>
-				<path refid="test.build.path"/>
-				<path refid="test.classpath"/>
-				<path refid="IoC.container.test.path"/>
-			</classpath>
-		</compile>
-		<copy todir="${build.dir}/classes/test">
-			<fileset dir="src/hivemind/test" excludes="**/*.java" />
-		</copy>
-	</target>
-	
-
-	<target name="jar-IoC-container" depends="compile-IoC-container">
-		<echo>Jar IoC Container classes and metadata</echo>
-		<jar
-	      destfile="${build.dir}/${final.name}${ioc.container.jar.suffix}"
-	      basedir="${build.dir}/classes/hivemind/java">
-	      <manifest>
-	        <attribute name="Created-By" value="Apache Jakarta"/>
-	        <section name="org/apache/lucene/">
-	          <attribute name="Specification-Title" value="Lucene GData IoC Container"/>
-	          <attribute name="Specification-Version" value="${version}"/>
-	          <attribute name="Specification-Vendor" value="Lucene GData Server"/>
-	          <attribute name="Implementation-Title" value="org.apache.lucene.gdata"/>
-	          <attribute name="Implementation-Version" value="build ${DSTAMP}"/>
-	          <attribute name="Implementation-Vendor" value="Lucene"/>
-	        </section>
-	      </manifest>
-	    </jar>
-	</target>
-	
-	
-	
-
-
-</project>
\ No newline at end of file
diff --git a/contrib/gdata-server/src/core/build.xml b/contrib/gdata-server/src/core/build.xml
new file mode 100644
index 00000000000..f3dd898411d
--- /dev/null
+++ b/contrib/gdata-server/src/core/build.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!-- 
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+-->
+<project name="gdata-core" default="default">
+
+	<description>
+		Lucene gdata server core build file
+	</description>
+	
+	<path id="additional.dependencies">
+			<fileset dir="../../${gdata.lib.dir}">
+				<include name="servlet-api.jar" />
+				<include name="commons-logging-1.1.jar" />
+				<include name="gdata-client-1.0.jar" />
+				<include name="commons-digester-1.7.jar" />
+				<include name="commons-beanutils.jar" />
+				<include name="commons-collections-3.2.jar" />
+				<include name="nekohtml.jar" />
+				<include name="xercesImpl.jar" />
+			</fileset>
+			<fileset dir="../../${gdata.external.lib.dir}">
+				<include name="easymock-1.2_Java1.5.jar" />
+				<include name="${db4o.jar}" if="db4o.jar.present" />
+			</fileset>
+		</path>
+	<property name="build.dir" location="../../../build/contrib/gdata-server/core" />
+	<property name="dist.dir" location="../../../dist/contrib/gdata-server/core" />
+
+	<pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
+	<import file="../../../contrib-build.xml" />
+
+
+
+	<target name="war-gdata" depends="jar-core">
+		<echo>Distributing GData War </echo>
+		<war destfile="${build.dir}/${gdata.war.name}.war" webxml="../../webroot/WEB-INF/web.xml">
+			<metainf dir="../../webroot/meta-inf" />
+			<fileset dir="../../webroot" defaultexcludes="true">
+				<exclude name="meta-inf/context.xml" />
+				<exclude name="meta-inf/" />
+				<exclude name="WEB-INF/web.xml" />
+			</fileset>
+			<fileset dir="../../${ioc.descriptors.dir}" excludes="${ioc.descriptors.excludes}" includes="${ioc.descriptors.includes}" />
+			<lib dir="../../${gdata.lib.dir}">
+				<include name="commons-logging-1.1.jar" />
+				<include name="gdata-client-1.0.jar" />
+				<include name="commons-digester-1.7.jar" />
+				<include name="commons-beanutils.jar" />
+				<include name="commons-collections-3.2.jar" />
+				<include name="nekohtml.jar" />
+				<include name="xercesImpl.jar" />
+				<include name="${db4o.jar}" if="db4o.jar.present" />
+			</lib>
+			<lib refid="hivemind.jars" />
+			<lib refid="gom.jars" />
+			<lib dir="${build.dir}" includes="${jar.name.core}.jar" />
+			<lib dir="${build.dir}/../gom" includes="${jar.name.gom}.jar" />
+			<lib dir="${build.dir}/../hivemind" includes="${jar.name.hivemind}.jar" />
+			<lib file="${lucene.jar}" />
+		</war>
+	</target>
+
+</project>
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/GDataAccount.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/GDataAccount.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/GDataAccount.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/GDataAccount.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/ServerBaseEntry.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/ServerBaseEntry.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/ServerBaseEntry.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/ServerBaseEntry.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/ServerBaseFeed.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/ServerBaseFeed.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/ServerBaseFeed.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/ServerBaseFeed.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/data/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/data/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/GDataSearcher.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/GDataSearcher.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/GDataSearcher.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/GDataSearcher.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/SearchComponent.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/SearchComponent.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/SearchComponent.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/SearchComponent.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/StandardGdataSearcher.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/StandardGdataSearcher.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/StandardGdataSearcher.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/StandardGdataSearcher.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/ContentStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/ContentStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/ContentStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/ContentStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/DomIndexable.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/DomIndexable.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/DomIndexable.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/DomIndexable.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/GdataCategoryStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/GdataCategoryStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/GdataCategoryStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/GdataCategoryStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/GdataDateStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/GdataDateStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/GdataDateStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/GdataDateStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/HTMLStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/HTMLStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/HTMLStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/HTMLStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/Indexable.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/Indexable.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/Indexable.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/Indexable.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/KeywordStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/KeywordStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/KeywordStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/KeywordStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/MixedContentStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/MixedContentStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/MixedContentStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/MixedContentStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/NotIndexableException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/NotIndexableException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/NotIndexableException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/NotIndexableException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/PlainTextStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/PlainTextStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/PlainTextStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/PlainTextStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/XHtmlStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/XHtmlStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/XHtmlStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/XHtmlStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/analysis/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/analysis/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/config/IndexSchema.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/config/IndexSchema.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/config/IndexSchema.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/config/IndexSchema.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/config/IndexSchemaField.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/config/IndexSchemaField.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/config/IndexSchemaField.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/config/IndexSchemaField.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/config/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/config/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/config/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/config/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GDataIndexDocument.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GDataIndexDocument.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GDataIndexDocument.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GDataIndexDocument.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GDataIndexWriter.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GDataIndexWriter.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GDataIndexWriter.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GDataIndexWriter.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GDataIndexer.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GDataIndexer.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GDataIndexer.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GDataIndexer.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GdataIndexerException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GdataIndexerException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/GdataIndexerException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/GdataIndexerException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexAction.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexAction.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexAction.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexAction.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexController.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexController.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexController.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexController.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexDocument.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexDocument.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexDocument.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexDocument.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilder.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilder.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilder.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilder.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilderTask.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilderTask.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilderTask.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexDocumentBuilderTask.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexEventListener.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexEventListener.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexEventListener.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexEventListener.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexFeedDeleteTask.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexFeedDeleteTask.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexFeedDeleteTask.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexFeedDeleteTask.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexLogReader.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexLogReader.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexLogReader.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexLogReader.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexLogWriter.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexLogWriter.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexLogWriter.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexLogWriter.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexTask.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexTask.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/IndexTask.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/IndexTask.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/TimedIndexTask.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/TimedIndexTask.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/TimedIndexTask.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/TimedIndexTask.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/index/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/index/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/query/GDataQueryParser.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/query/GDataQueryParser.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/query/GDataQueryParser.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/query/GDataQueryParser.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/query/QueryTranslator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/query/QueryTranslator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/search/query/QueryTranslator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/search/query/QueryTranslator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/FeedNotFoundException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/FeedNotFoundException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/FeedNotFoundException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/FeedNotFoundException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataEntityBuilder.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataEntityBuilder.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataEntityBuilder.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataEntityBuilder.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataRequest.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataRequest.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataRequest.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataRequest.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataRequestException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataRequestException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataRequestException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataRequestException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataResponse.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataResponse.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataResponse.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataResponse.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataSearchService.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataSearchService.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataSearchService.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataSearchService.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataService.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataService.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/GDataService.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/GDataService.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/Service.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/Service.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/Service.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/Service.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/ServiceException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/ServiceException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/ServiceException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/ServiceException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/ServiceFactory.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/ServiceFactory.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/ServiceFactory.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/ServiceFactory.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/AccountBuilder.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/AccountBuilder.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/AccountBuilder.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/AccountBuilder.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/AdminService.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/AdminService.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/AdminService.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/AdminService.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/GDataAdminService.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/GDataAdminService.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/GDataAdminService.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/GDataAdminService.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/administration/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/administration/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/AuthenticationController.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/AuthenticationController.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/AuthenticationController.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/AuthenticationController.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/AuthenticationException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/AuthenticationException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/AuthenticationException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/AuthenticationException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/AuthenticatorException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/AuthenticatorException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/AuthenticatorException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/AuthenticatorException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/BlowfishAuthenticationController.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/BlowfishAuthenticationController.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/BlowfishAuthenticationController.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/BlowfishAuthenticationController.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/GDataHttpAuthenticator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/GDataHttpAuthenticator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/GDataHttpAuthenticator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/GDataHttpAuthenticator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/authentication/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/authentication/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/Component.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/Component.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/Component.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/Component.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ComponentType.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ComponentType.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ComponentType.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ComponentType.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/DataBuilderException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/DataBuilderException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/DataBuilderException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/DataBuilderException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/EntryEventListener.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/EntryEventListener.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/EntryEventListener.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/EntryEventListener.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/EntryEventMediator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/EntryEventMediator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/EntryEventMediator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/EntryEventMediator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/FeedInstanceConfigurator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/FeedInstanceConfigurator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/FeedInstanceConfigurator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/FeedInstanceConfigurator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/GDataRequestListener.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/GDataRequestListener.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/GDataRequestListener.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/GDataRequestListener.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/GDataServerRegistry.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/GDataServerRegistry.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/GDataServerRegistry.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/GDataServerRegistry.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ProvidedService.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ProvidedService.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ProvidedService.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ProvidedService.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ProvidedServiceConfig.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ProvidedServiceConfig.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ProvidedServiceConfig.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ProvidedServiceConfig.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/RegistryBuilder.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/RegistryBuilder.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/RegistryBuilder.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/RegistryBuilder.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/RegistryContextListener.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/RegistryContextListener.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/RegistryContextListener.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/RegistryContextListener.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/RegistryException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/RegistryException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/RegistryException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/RegistryException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/Scope.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/Scope.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/Scope.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/Scope.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ScopeVisitable.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ScopeVisitable.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ScopeVisitable.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ScopeVisitable.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ScopeVisitor.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ScopeVisitor.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ScopeVisitor.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ScopeVisitor.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ServerComponent.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ServerComponent.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/ServerComponent.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/ServerComponent.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/SuperType.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/SuperType.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/SuperType.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/SuperType.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/ComponentConfiguration.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/ComponentConfiguration.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/ComponentConfiguration.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/ComponentConfiguration.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/InjectionException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/InjectionException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/InjectionException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/InjectionException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/PropertyInjector.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/PropertyInjector.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/PropertyInjector.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/PropertyInjector.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/Requiered.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/Requiered.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/configuration/Requiered.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/configuration/Requiered.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/server/registry/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/server/registry/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/AbstractGdataServlet.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/AbstractGdataServlet.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/AbstractGdataServlet.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/AbstractGdataServlet.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/AccountAdministrationServlet.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/AccountAdministrationServlet.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/AccountAdministrationServlet.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/AccountAdministrationServlet.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/AuthenticationServlet.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/AuthenticationServlet.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/AuthenticationServlet.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/AuthenticationServlet.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/FeedAdministrationServlet.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/FeedAdministrationServlet.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/FeedAdministrationServlet.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/FeedAdministrationServlet.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/RequestControllerServlet.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/RequestControllerServlet.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/RequestControllerServlet.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/RequestControllerServlet.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AbstractAccountHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AbstractAccountHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AbstractAccountHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AbstractAccountHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AbstractFeedHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AbstractFeedHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AbstractFeedHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AbstractFeedHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AbstractGdataRequestHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AbstractGdataRequestHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AbstractGdataRequestHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AbstractGdataRequestHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AuthenticationHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AuthenticationHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/AuthenticationHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/AuthenticationHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultDeleteHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultDeleteHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultDeleteHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultDeleteHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultGetHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultGetHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultGetHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultGetHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultInsertHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultInsertHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultInsertHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultInsertHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultRequestHandlerFactory.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultRequestHandlerFactory.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultRequestHandlerFactory.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultRequestHandlerFactory.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultUpdateHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultUpdateHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DefaultUpdateHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DefaultUpdateHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DeleteAccountStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DeleteAccountStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DeleteAccountStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DeleteAccountStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DeleteFeedHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DeleteFeedHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/DeleteFeedHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/DeleteFeedHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandlerException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandlerException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandlerException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/GDataRequestHandlerException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/InsertAccountStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/InsertAccountStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/InsertAccountStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/InsertAccountStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/InsertFeedHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/InsertFeedHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/InsertFeedHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/InsertFeedHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/RequestAuthenticator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/RequestAuthenticator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/RequestAuthenticator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/RequestAuthenticator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/RequestHandlerFactory.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/RequestHandlerFactory.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/RequestHandlerFactory.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/RequestHandlerFactory.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/UpdateAccountStrategy.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/UpdateAccountStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/UpdateAccountStrategy.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/UpdateAccountStrategy.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/UpdateFeedHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/UpdateFeedHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/UpdateFeedHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/UpdateFeedHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/handler/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/handler/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/servlet/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/servlet/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/IDGenerator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/IDGenerator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/IDGenerator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/IDGenerator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/ModificationConflictException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/ModificationConflictException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/ModificationConflictException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/ModificationConflictException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/ResourceNotFoundException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/ResourceNotFoundException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/ResourceNotFoundException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/ResourceNotFoundException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/Storage.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/Storage.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/Storage.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/Storage.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/StorageController.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/StorageController.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/StorageController.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/StorageController.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/StorageException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/StorageException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/StorageException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/StorageException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/StorageFactory.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/StorageFactory.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/StorageFactory.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/StorageFactory.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/DB4oController.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/DB4oController.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/DB4oController.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/DB4oController.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/DB4oStorage.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/DB4oStorage.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/DB4oStorage.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/DB4oStorage.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/ObjectServerDecorator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/ObjectServerDecorator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/ObjectServerDecorator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/ObjectServerDecorator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/db4o/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/db4o/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/ConcurrentStorageLock.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/ConcurrentStorageLock.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/ConcurrentStorageLock.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/ConcurrentStorageLock.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/ModifiedEntryFilter.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/ModifiedEntryFilter.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/ModifiedEntryFilter.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/ModifiedEntryFilter.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/SingleHostConcurrentStorageLock.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/SingleHostConcurrentStorageLock.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/SingleHostConcurrentStorageLock.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/SingleHostConcurrentStorageLock.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageAccountWrapper.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageAccountWrapper.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageAccountWrapper.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageAccountWrapper.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageBuffer.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageBuffer.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageBuffer.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageBuffer.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreController.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreController.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreController.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreController.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageEntryWrapper.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageEntryWrapper.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageEntryWrapper.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageEntryWrapper.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageFeedWrapper.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageFeedWrapper.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageFeedWrapper.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageFeedWrapper.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageImplementation.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageImplementation.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageImplementation.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageImplementation.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageModifier.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageModifier.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageModifier.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageModifier.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageQuery.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageQuery.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageQuery.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageQuery.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageWrapper.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageWrapper.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/StorageWrapper.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/StorageWrapper.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/StorageConfigurator.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/StorageConfigurator.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/StorageConfigurator.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/StorageConfigurator.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/configuration/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverController.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverController.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverController.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverController.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverException.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverException.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverException.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverException.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverReader.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverReader.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverReader.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverReader.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverWriter.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverWriter.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverWriter.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/RecoverWriter.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/recover/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/recover/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/util/ReferenceCounter.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/util/ReferenceCounter.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/util/ReferenceCounter.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/util/ReferenceCounter.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/util/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/util/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/lucenestorage/util/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/lucenestorage/util/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/storage/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/storage/package.html
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/DateFormater.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/DateFormater.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/DateFormater.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/DateFormater.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/ModifiedEntryFilter.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/ModifiedEntryFilter.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/ModifiedEntryFilter.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/ModifiedEntryFilter.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/Pool.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/Pool.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/Pool.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/Pool.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/PoolObjectFactory.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/PoolObjectFactory.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/PoolObjectFactory.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/PoolObjectFactory.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/ReferenceCounter.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/ReferenceCounter.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/ReferenceCounter.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/ReferenceCounter.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/ReflectionUtils.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/ReflectionUtils.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/ReflectionUtils.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/ReflectionUtils.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/SimpleObjectPool.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/SimpleObjectPool.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/SimpleObjectPool.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/SimpleObjectPool.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/SimpleSaxErrorHandler.java b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/SimpleSaxErrorHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/SimpleSaxErrorHandler.java
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/SimpleSaxErrorHandler.java
diff --git a/contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/package.html b/contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/package.html
similarity index 100%
rename from contrib/gdata-server/src/core/java/org/apache/lucene/gdata/utils/package.html
rename to contrib/gdata-server/src/core/src/java/org/apache/lucene/gdata/utils/package.html
diff --git a/contrib/gdata-server/src/core/test/gdata-account.xsd b/contrib/gdata-server/src/core/src/test/gdata-account.xsd
similarity index 100%
rename from contrib/gdata-server/src/core/test/gdata-account.xsd
rename to contrib/gdata-server/src/core/src/test/gdata-account.xsd
diff --git a/contrib/gdata-server/src/core/test/gdata-config.xml b/contrib/gdata-server/src/core/src/test/gdata-config.xml
similarity index 100%
rename from contrib/gdata-server/src/core/test/gdata-config.xml
rename to contrib/gdata-server/src/core/src/test/gdata-config.xml
diff --git a/contrib/gdata-server/src/core/test/lucenestorage.properties.xml b/contrib/gdata-server/src/core/src/test/lucenestorage.properties.xml
similarity index 100%
rename from contrib/gdata-server/src/core/test/lucenestorage.properties.xml
rename to contrib/gdata-server/src/core/src/test/lucenestorage.properties.xml
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/data/TestGDataUser.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/data/TestGDataUser.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/data/TestGDataUser.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/data/TestGDataUser.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/TestStandardGdataSearcher.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/TestStandardGdataSearcher.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/TestStandardGdataSearcher.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/TestStandardGdataSearcher.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/IndexableStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/IndexableStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/IndexableStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/IndexableStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestContentStrategy.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestContentStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestContentStrategy.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestContentStrategy.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestDomIndexable.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestDomIndexable.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestDomIndexable.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestDomIndexable.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestGdataCategoryStrategy.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestGdataCategoryStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestGdataCategoryStrategy.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestGdataCategoryStrategy.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestGdataDateStrategy.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestGdataDateStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestGdataDateStrategy.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestGdataDateStrategy.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestHTMLStrategy.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestHTMLStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestHTMLStrategy.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestHTMLStrategy.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestKeywordStrategy.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestKeywordStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestKeywordStrategy.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestKeywordStrategy.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestMixedStrategy.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestMixedStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestMixedStrategy.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestMixedStrategy.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestPlainTextStrategy.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestPlainTextStrategy.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/analysis/TestPlainTextStrategy.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/analysis/TestPlainTextStrategy.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/config/TestIndexSchema.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/config/TestIndexSchema.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/config/TestIndexSchema.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/config/TestIndexSchema.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/config/TestIndexSchemaField.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/config/TestIndexSchemaField.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/config/TestIndexSchemaField.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/config/TestIndexSchemaField.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/FutureStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/FutureStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/FutureStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/FutureStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/IndexDocumentStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/IndexDocumentStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/IndexDocumentStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/IndexDocumentStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/IndexEventListenerStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/IndexEventListenerStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/IndexEventListenerStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/IndexEventListenerStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestGdataIndexDocument.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestGdataIndexDocument.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestGdataIndexDocument.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestGdataIndexDocument.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestGdataIndexWriter.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestGdataIndexWriter.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestGdataIndexWriter.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestGdataIndexWriter.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestGdataIndexer.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestGdataIndexer.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestGdataIndexer.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestGdataIndexer.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestIndexController.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestIndexController.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestIndexController.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestIndexController.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestIndexLogReader.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestIndexLogReader.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestIndexLogReader.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestIndexLogReader.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestindexDocumentBuilderTask.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestindexDocumentBuilderTask.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/index/TestindexDocumentBuilderTask.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/index/TestindexDocumentBuilderTask.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/query/TestGdataQueryParser.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/query/TestGdataQueryParser.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/query/TestGdataQueryParser.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/query/TestGdataQueryParser.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/query/TestQueryTranslator.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/query/TestQueryTranslator.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/search/query/TestQueryTranslator.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/search/query/TestQueryTranslator.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/TestGDataRequest.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/TestGDataRequest.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/TestGDataRequest.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/TestGDataRequest.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/TestGDataResponse.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/TestGDataResponse.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/TestGDataResponse.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/TestGDataResponse.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/administration/TestAccountBuilder.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/administration/TestAccountBuilder.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/administration/TestAccountBuilder.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/administration/TestAccountBuilder.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/authentication/TestBlowfishAuthenticationController.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/authentication/TestBlowfishAuthenticationController.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/authentication/TestBlowfishAuthenticationController.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/authentication/TestBlowfishAuthenticationController.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingEntry.xml b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingEntry.xml
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingEntry.xml
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingEntry.xml
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingFeed.xml b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingFeed.xml
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingFeed.xml
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestEntityBuilderIncomingFeed.xml
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestFeedRegistry.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestFeedRegistry.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestFeedRegistry.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestFeedRegistry.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestGDataEntityBuilder.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestGDataEntityBuilder.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestGDataEntityBuilder.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestGDataEntityBuilder.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestProvidedServiceConfig.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestProvidedServiceConfig.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/TestProvidedServiceConfig.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/TestProvidedServiceConfig.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/configuration/TestConfigurationBean.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/configuration/TestConfigurationBean.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/configuration/TestConfigurationBean.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/configuration/TestConfigurationBean.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/configuration/TestPropertyInjector.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/configuration/TestPropertyInjector.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/server/registry/configuration/TestPropertyInjector.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/server/registry/configuration/TestPropertyInjector.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/servlet/TestAbstractGdataServlet.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/servlet/TestAbstractGdataServlet.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/servlet/TestAbstractGdataServlet.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/servlet/TestAbstractGdataServlet.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/servlet/handler/TestAbstractFeedHandler.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/servlet/handler/TestAbstractFeedHandler.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/servlet/handler/TestAbstractFeedHandler.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/servlet/handler/TestAbstractFeedHandler.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/servlet/handler/TestRequestAuthenticator.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/servlet/handler/TestRequestAuthenticator.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/servlet/handler/TestRequestAuthenticator.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/servlet/handler/TestRequestAuthenticator.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/TestIDGenerator.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/TestIDGenerator.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/TestIDGenerator.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/TestIDGenerator.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/db4o/TestDb4oStorage.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/db4o/TestDb4oStorage.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/db4o/TestDb4oStorage.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/db4o/TestDb4oStorage.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/db4o/TestObjectServerDecorator.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/db4o/TestObjectServerDecorator.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/db4o/TestObjectServerDecorator.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/db4o/TestObjectServerDecorator.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreControllerStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreControllerStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreControllerStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/StorageCoreControllerStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/StorageModifierStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/StorageModifierStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/StorageModifierStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/StorageModifierStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/StorageQueryStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/StorageQueryStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/StorageQueryStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/StorageQueryStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestModifiedEntryFilter.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestModifiedEntryFilter.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestModifiedEntryFilter.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestModifiedEntryFilter.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestSingelHostConcurrencyLock.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestSingelHostConcurrencyLock.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestSingelHostConcurrencyLock.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestSingelHostConcurrencyLock.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageBuffer.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageBuffer.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageBuffer.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageBuffer.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageImplementation.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageImplementation.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageImplementation.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageImplementation.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageModifier.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageModifier.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageModifier.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageModifier.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageQuery.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageQuery.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageQuery.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/TestStorageQuery.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverController.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverController.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverController.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverController.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverWriter.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverWriter.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverWriter.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRecoverWriter.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRevocerReader.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRevocerReader.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRevocerReader.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/storage/lucenestorage/recover/TestRevocerReader.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/AuthenticationContorllerStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/AuthenticationContorllerStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/AuthenticationContorllerStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/AuthenticationContorllerStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/MultiThreadEntryStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/MultiThreadEntryStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/MultiThreadEntryStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/MultiThreadEntryStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/ProvidedServiceStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/ProvidedServiceStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/ProvidedServiceStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/ProvidedServiceStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/ServiceFactoryStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/ServiceFactoryStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/ServiceFactoryStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/ServiceFactoryStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/StorageControllerStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/StorageControllerStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/StorageControllerStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/StorageControllerStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/StorageStub.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/StorageStub.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/StorageStub.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/StorageStub.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/TestDateFormater.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/TestDateFormater.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/TestDateFormater.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/TestDateFormater.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/TestReflectionUtils.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/TestReflectionUtils.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/TestReflectionUtils.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/TestReflectionUtils.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/TestSimpleObjectPool.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/TestSimpleObjectPool.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/TestSimpleObjectPool.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/TestSimpleObjectPool.java
diff --git a/contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/Visitor.java b/contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/Visitor.java
similarity index 100%
rename from contrib/gdata-server/src/core/test/org/apache/lucene/gdata/utils/Visitor.java
rename to contrib/gdata-server/src/core/src/test/org/apache/lucene/gdata/utils/Visitor.java
diff --git a/contrib/gdata-server/gdata-build/ioc-container.xml b/contrib/gdata-server/src/gom/build.xml
similarity index 56%
rename from contrib/gdata-server/gdata-build/ioc-container.xml
rename to contrib/gdata-server/src/gom/build.xml
index 17f28a79219..3d10e892a85 100644
--- a/contrib/gdata-server/gdata-build/ioc-container.xml
+++ b/contrib/gdata-server/src/gom/build.xml
@@ -16,7 +16,19 @@
   limitations under the License.
  
 -->
-<project name="gdata-ioc-container">
-	<!-- specify your IOC container build file here -->
-	<import file="hivemind-build.xml"/>
-</project>
\ No newline at end of file
+<project name="gdata-gom" default="default">
+
+  <description>
+	Lucene gdata server GData Object Model build file
+  </description>
+	<path id="additional.dependencies">
+			<fileset dir="../../${gdata.external.lib.dir}">
+				<include name="stax-1.1.2-dev.jar" />
+				<include name="stax-api-1.0.1.jar" />
+			</fileset>
+		</path>
+	<property name="build.dir" location="../../../build/contrib/gdata-server/gom" />
+	<property name="dist.dir" location="../../../dist/contrib/gdata-server/gom" />
+	<pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
+  <import file="../../../contrib-build.xml" />
+</project>
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/AtomMediaType.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/AtomMediaType.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/AtomMediaType.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/AtomMediaType.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/ContentType.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/ContentType.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/ContentType.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/ContentType.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMAttribute.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMAttribute.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMAttribute.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMAttribute.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMAuthor.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMAuthor.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMAuthor.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMAuthor.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMCategory.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMCategory.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMCategory.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMCategory.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMContent.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMContent.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMContent.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMContent.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMContributor.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMContributor.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMContributor.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMContributor.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMDateConstruct.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMDateConstruct.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMDateConstruct.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMDateConstruct.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMDocument.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMDocument.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMDocument.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMDocument.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMElement.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMElement.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMElement.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMElement.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMEntry.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMEntry.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMEntry.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMEntry.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMExtensible.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMExtensible.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMExtensible.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMExtensible.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMExtension.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMExtension.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMExtension.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMExtension.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMFeed.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMFeed.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMFeed.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMFeed.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMGenerator.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMGenerator.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMGenerator.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMGenerator.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMIcon.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMIcon.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMIcon.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMIcon.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMId.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMId.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMId.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMId.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMLink.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMLink.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMLink.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMLink.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMLogo.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMLogo.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMLogo.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMLogo.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMNamespace.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMNamespace.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMNamespace.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMNamespace.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMPerson.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMPerson.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMPerson.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMPerson.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMPublished.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMPublished.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMPublished.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMPublished.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMRights.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMRights.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMRights.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMRights.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMSource.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMSource.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMSource.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMSource.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMSubtitle.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMSubtitle.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMSubtitle.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMSubtitle.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMSummary.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMSummary.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMSummary.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMSummary.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMTextConstruct.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMTextConstruct.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMTextConstruct.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMTextConstruct.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMTime.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMTime.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMTime.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMTime.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMTitle.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMTitle.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMTitle.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMTitle.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMUpdated.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMUpdated.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMUpdated.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMUpdated.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMXmlEntity.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMXmlEntity.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/GOMXmlEntity.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/GOMXmlEntity.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/AbstractGOMElement.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/AbstractGOMElement.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/AbstractGOMElement.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/AbstractGOMElement.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/ArbitraryGOMXml.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/ArbitraryGOMXml.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/ArbitraryGOMXml.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/ArbitraryGOMXml.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/AtomParser.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/AtomParser.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/AtomParser.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/AtomParser.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/AtomUriElement.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/AtomUriElement.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/AtomUriElement.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/AtomUriElement.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GDataParseException.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GDataParseException.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GDataParseException.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GDataParseException.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMAttributeImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMAttributeImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMAttributeImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMAttributeImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMAuthorImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMAuthorImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMAuthorImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMAuthorImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMBuilder.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMBuilder.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMBuilder.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMBuilder.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMCategoryImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMCategoryImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMCategoryImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMCategoryImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMContentImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMContentImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMContentImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMContentImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMContributorImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMContributorImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMContributorImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMContributorImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMDateConstructImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMDateConstructImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMDateConstructImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMDateConstructImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMDocumentImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMDocumentImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMDocumentImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMDocumentImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMEntryImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMEntryImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMEntryImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMEntryImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMFactory.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMFactory.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMFactory.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMFactory.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMFeedImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMFeedImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMFeedImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMFeedImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMGeneratorImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMGeneratorImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMGeneratorImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMGeneratorImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMIconImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMIconImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMIconImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMIconImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMIdImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMIdImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMIdImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMIdImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMLinkImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMLinkImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMLinkImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMLinkImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMLogoImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMLogoImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMLogoImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMLogoImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMPersonImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMPersonImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMPersonImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMPersonImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMPublishedImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMPublishedImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMPublishedImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMPublishedImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMRightsImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMRightsImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMRightsImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMRightsImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMSourceImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMSourceImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMSourceImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMSourceImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMSubtitleImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMSubtitleImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMSubtitleImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMSubtitleImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMSummaryImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMSummaryImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMSummaryImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMSummaryImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMTextContructImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMTextContructImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMTextContructImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMTextContructImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMTitleImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMTitleImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMTitleImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMTitleImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMUpdatedImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMUpdatedImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/GOMUpdatedImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/GOMUpdatedImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/SimpleElementParser.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/SimpleElementParser.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/SimpleElementParser.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/SimpleElementParser.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/SimpleGOMElementImpl.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/SimpleGOMElementImpl.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/SimpleGOMElementImpl.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/SimpleGOMElementImpl.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/core-aid.gif b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/core-aid.gif
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/core-aid.gif
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/core-aid.gif
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/core-aid.ucd b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/core-aid.ucd
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/core-aid.ucd
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/core-aid.ucd
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/core-aid.uml b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/core-aid.uml
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/core-aid.uml
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/core-aid.uml
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/extension/GOMExtensionFactory.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/extension/GOMExtensionFactory.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/extension/GOMExtensionFactory.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/extension/GOMExtensionFactory.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/utils/AtomParserUtils.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/utils/AtomParserUtils.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/utils/AtomParserUtils.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/utils/AtomParserUtils.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/utils/GOMUtils.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/utils/GOMUtils.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/core/utils/GOMUtils.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/core/utils/GOMUtils.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMOutputWriter.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMOutputWriter.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMOutputWriter.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMOutputWriter.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMStaxWriter.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMStaxWriter.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMStaxWriter.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMStaxWriter.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMXmlOutputFactory.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMXmlOutputFactory.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMXmlOutputFactory.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMXmlOutputFactory.java
diff --git a/contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMXmlWriter.java b/contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMXmlWriter.java
similarity index 100%
rename from contrib/gdata-server/src/gom/java/org/apache/lucene/gdata/gom/writer/GOMXmlWriter.java
rename to contrib/gdata-server/src/gom/src/java/org/apache/lucene/gdata/gom/writer/GOMXmlWriter.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/GOMNamespaceTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/GOMNamespaceTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/GOMNamespaceTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/GOMNamespaceTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/ArbitraryGOMXmlTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/ArbitraryGOMXmlTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/ArbitraryGOMXmlTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/ArbitraryGOMXmlTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/AtomUriElementTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/AtomUriElementTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/AtomUriElementTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/AtomUriElementTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMAttributeImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMAttributeImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMAttributeImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMAttributeImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMAuthorImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMAuthorImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMAuthorImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMAuthorImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMCategoryTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMCategoryTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMCategoryTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMCategoryTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMContentImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMContentImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMContentImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMContentImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMDateConstructImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMDateConstructImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMDateConstructImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMDateConstructImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMDocumentImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMDocumentImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMDocumentImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMDocumentImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMEntryImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMEntryImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMEntryImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMEntryImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMFeedImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMFeedImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMFeedImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMFeedImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMGenereatorImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMGenereatorImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMGenereatorImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMGenereatorImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMIdImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMIdImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMIdImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMIdImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMLinkImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMLinkImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMLinkImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMLinkImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMPersonImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMPersonImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMPersonImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMPersonImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMSourceImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMSourceImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMSourceImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMSourceImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMTextConstructImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMTextConstructImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/GOMTextConstructImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/GOMTextConstructImplTest.java
diff --git a/contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/SimpleGOMElementImplTest.java b/contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/SimpleGOMElementImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/gom/test/org/apache/lucene/gdata/gom/core/SimpleGOMElementImplTest.java
rename to contrib/gdata-server/src/gom/src/test/org/apache/lucene/gdata/gom/core/SimpleGOMElementImplTest.java
diff --git a/contrib/gdata-server/src/hivemind/build.xml b/contrib/gdata-server/src/hivemind/build.xml
new file mode 100644
index 00000000000..27104a93abb
--- /dev/null
+++ b/contrib/gdata-server/src/hivemind/build.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!-- 
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+-->
+<project name="hivemind" default="default">
+
+	<description>
+		Lucene gdata server hivemind sources build file
+	</description>
+	<path id="additional.dependencies">
+			<fileset dir="../../${gdata.lib.dir}">
+						<include name="servlet-api.jar" />
+						<include name="commons-logging-1.1.jar" />
+			</fileset>
+			<fileset dir="../../${gdata.external.lib.dir}">
+				<include name="easymock-1.2_Java1.5.jar" />
+				<include name="hivemind-1.1.jar" />
+				<include name="hivemind-lib-1.1.jar" />
+				<include name="hivemind-jmx-1.1.jar" />
+				<include name="hessian-3.0.20.jar" />
+			</fileset>
+		</path>
+	<pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
+	
+	<property name="build.dir" location="../../../build/contrib/gdata-server/hivemind" />
+	<property name="dist.dir" location="../../../dist/contrib/gdata-server/hivemind" />
+	<import file="../../../contrib-build.xml" />
+</project>
diff --git a/contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/servlet/HessianServiceServlet.java b/contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/servlet/HessianServiceServlet.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/servlet/HessianServiceServlet.java
rename to contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/servlet/HessianServiceServlet.java
diff --git a/contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvoker.java b/contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvoker.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvoker.java
rename to contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvoker.java
diff --git a/contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvokerImpl.java b/contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvokerImpl.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvokerImpl.java
rename to contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianServiceSkeletonInvokerImpl.java
diff --git a/contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProvider.java b/contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProvider.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProvider.java
rename to contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProvider.java
diff --git a/contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImpl.java b/contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImpl.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImpl.java
rename to contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImpl.java
diff --git a/contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/NoSuchServiceException.java b/contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/NoSuchServiceException.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/NoSuchServiceException.java
rename to contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/NoSuchServiceException.java
diff --git a/contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/WebserviceMappingBean.java b/contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/WebserviceMappingBean.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/java/org/apache/lucene/gdata/hivemind/webservice/WebserviceMappingBean.java
rename to contrib/gdata-server/src/hivemind/src/java/org/apache/lucene/gdata/hivemind/webservice/WebserviceMappingBean.java
diff --git a/contrib/gdata-server/src/hivemind/test/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImplTest.java b/contrib/gdata-server/src/hivemind/src/test/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImplTest.java
similarity index 100%
rename from contrib/gdata-server/src/hivemind/test/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImplTest.java
rename to contrib/gdata-server/src/hivemind/src/test/org/apache/lucene/gdata/hivemind/webservice/HessianSkeletonProviderImplTest.java