You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by ni...@apache.org on 2004/03/19 11:39:39 UTC

svn commit: rev 9613 - in incubator/depot/trunk: ruper/src/java/org/apache/ruper ruper/src/java/org/apache/ruper/ant/sandbox/chalko ruper/src/java/org/apache/ruper/ant/task ruper/src/java/org/apache/ruper/config ruper/src/java/org/apache/ruper/files ruper/src/java/org/apache/ruper/impl ruper/src/java/org/apache/ruper/messaging ruper/src/java/org/apache/ruper/monitor ruper/src/java/org/apache/ruper/protocols ruper/src/java/org/apache/ruper/protocols/impl ruper/src/java/org/apache/ruper/protocols/select ruper/src/java/org/apache/ruper/query ruper/src/java/org/apache/ruper/repository ruper/src/java/org/apache/ruper/repository/compare ruper/src/java/org/apache/ruper/repository/select ruper/src/java/org/apache/ruper/resource ruper/src/java/org/apache/ruper/resource/compare ruper/src/java/org/apache/ruper/resource/select ruper/src/java/org/apache/ruper/tool ruper/src/java/org/apache/ruper/util ruper/src/java/org/apache/ruper/util/chainprocess ruper/src/java/org/apache/ruper/util/compare ruper/src/java/org/apache/ruper/util/flag ruper/src/java/org/apache/ruper/util/identity ruper/src/java/org/apache/ruper/util/io ruper/src/java/org/apache/ruper/util/net ruper/src/java/org/apache/ruper/util/net/http ruper/src/java/org/apache/ruper/util/net/select ruper/src/java/org/apache/ruper/util/reference ruper/src/java/org/apache/ruper/util/regexp ruper/src/java/org/apache/ruper/util/security ruper/src/java/org/apache/ruper/util/select ruper/src/java/org/apache/ruper/util/select/logic ruper/src/java/org/apache/ruper/util/text ruper/src/java/org/apache/ruper/util/xml ruper/src/java/org/apache/ruper/version ruper/src/sample/src/org/apache/depot/ruper/sample ruper/src/test/org/apache/ruper/ant/sandbox/chalko ruper/src/test/org/apache/ruper/ant/task ruper/src/test/org/apache/ruper/files ruper/src/test/org/apache/ruper/misc ruper/src/test/org/apache/ruper/protocols ruper/src/test/org/apache/ruper/query ruper/src/test/org/apache/ruper/repository ruper/src/test/org/apache/ruper/resource ruper/src/test/org/apache/ruper/usecases ruper/src/test/org/apache/ruper/util/net ruper/src/test/org/apache/ruper/util/security ruper/src/test/org/apache/ruper/util/select ruper/src/test/org/apache/ruper/util/select/logic ruper/src/test/org/apache/ruper/util/text ruper/src/test/org/apache/ruper/util/xml version/src/java/ant/org/apache/version/ant version/src/java/ant/org/apache/version/ant/about version/src/java/ant/org/apache/version/ant/available version/src/java/ant/org/apache/version/ant/constraint version/src/java/ant/org/apache/version/ant/environment version/src/java/ant/org/apache/version/ant/nested version/src/java/ant/org/apache/version/ant/stamp version/src/java/ant/org/apache/version/ant/util version/src/java/core/org/apache/version version/src/java/core/org/apache/version/analysis version/src/java/core/org/apache/version/constraint version/src/java/core/org/apache/version/constraint/impl version/src/java/core/org/apache/version/constraint/text version/src/java/core/org/apache/version/context version/src/java/core/org/apache/version/discovery/collecting version/src/java/core/org/apache/version/discovery/loading version/src/java/core/org/apache/version/experimental/sample version/src/java/core/org/apache/version/extension version/src/java/core/org/apache/version/generation/dom version/src/java/core/org/apache/version/generation/source version/src/java/core/org/apache/version/impl version/src/java/core/org/apache/version/impl/data version/src/java/core/org/apache/version/impl/data/util version/src/java/core/org/apache/version/impl/release/util version/src/java/core/org/apache/version/impl/util version/src/java/core/org/apache/version/interfacing version/src/java/core/org/apache/version/interfacing/signature version/src/java/core/org/apache/version/log version/src/java/core/org/apache/version/signature version/src/java/core/org/apache/version/specification version/src/java/core/org/apache/version/specification/experimental version/src/java/core/org/apache/version/specification/formatting version/src/java/core/org/apache/version/specification/formatting/experimental version/src/java/core/org/apache/version/specification/formatting/format version/src/java/core/org/apache/version/tool version/src/java/core/org/apache/version/util version/src/java/core/org/apache/version/util/classpath version/src/java/core/org/apache/version/util/classpath/listener version/src/java/core/org/apache/version/util/cli version/src/java/core/org/apache/version/util/collection version/src/java/core/org/apache/version/util/debug version/src/java/core/org/apache/version/util/dom version/src/java/core/org/apache/version/util/envsafe version/src/java/core/org/apache/version/util/io version/src/java/core/org/apache/version/util/jar version/src/java/core/org/apache/version/util/note version/src/java/core/org/apache/version/util/throwable version/src/java/core/org/apache/version/version version/src/test/java/ant/org/apache/version/ant/available version/src/test/java/ant/org/apache/version/ant/constraint version/src/test/java/ant/org/apache/version/ant/environment version/src/test/java/ant/org/apache/version/ant/stamp version/src/test/java/core/org/apache/version version/src/test/java/core/org/apache/version/constraint/discovery/text version/src/test/java/core/org/apache/version/context version/src/test/java/core/org/apache/version/discovery/loading version/src/test/java/core/org/apache/version/extension version/src/test/java/core/org/apache/version/formatting version/src/test/java/core/org/apache/version/impl version/src/test/java/core/org/apache/version/impl/data version/src/test/java/core/org/apache/version/impl/sample version/src/test/java/core/org/apache/version/interfacing version/src/test/java/core/org/apache/version/interfacing/api version/src/test/java/core/org/apache/version/interfacing/complex version/src/test/java/core/org/apache/version/interfacing/field version/src/test/java/core/org/apache/version/util version/src/test/java/core/org/apache/version/util/classpath version/src/test/java/core/org/apache/version/util/dom

Author: nicolaken
Date: Fri Mar 19 03:39:27 2004
New Revision: 9613

Modified:
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ClasspathUpdater.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/DefaultResourceUpdater.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileAssistant.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileUpdater.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ResourceUpdater.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperException.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperRuntimeException.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/StandardResourceUpdater.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RepositoryElement.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/ResourceElement.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperFileSet.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperSet.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/RepositoryToolTask.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/SynchronizeTask.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/ConfigXMLEntryTable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/RuperConfig.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceFilenameAnalyzer.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceGroupFilenameAnalyzer.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/ExtensionTable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceFilenameAnalyzer.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceGroupFilenameAnalyzer.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/TypeTable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ReferenceManager.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryObject.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryResourceObject.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositorySetWrapper.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryWrapper.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContext.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContextIdentifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterEngine.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterIdentifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterOptions.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceAction.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceRequest.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceResponse.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/FileEvent.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/IMonitor.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/Monitor.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/MonitorEvent.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/ResourceEvent.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StandardMonitor.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StatisticsMonitor.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/DefaultProtocolOperationsManager.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/IProtocolOperationsProvider.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/Protocol.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/ProtocolOperationsManager.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/AbstractProtocolOperationsProvider.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/BasicProtocolOperationsProvider.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/FileProtocolOperationsProvider.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/HttpClientProtocolOperationsProvider.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/VfsProtocolOperationsProvider.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/AbstractProtocolProviderSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/DestinationProtocolProviderSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceDestinationProtocolProviderSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceProtocolProviderSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/DefaultQueryEngine.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQuery.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQueryHelper.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResult.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResultHelper.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractHierarchicalRepository.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractRepository.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/DefaultRepository.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/IRepository.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/MockRepository.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttribute.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttributeMap.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapability.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapabilitySet.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryConstants.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryException.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryIdentifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManager.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManifest.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySet.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetIdentifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContext.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContextIdentifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySorterConfig.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/AbstractRepositoryComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/PriorityComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AbstractRepositorySelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/ActiveRepositorySelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AttributeBasedRepositorySelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/LocalRepositorySelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/RemoteRepositorySelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/Resource.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttribute.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttributeMap.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceConstants.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceGroup.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceIdentifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceLocator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceSpecifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceType.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceGroupComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/FilenameComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/NameComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/ResourceGroupNameComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/StandardResourceComparisons.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/TypeComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/VersionComparator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/AbstractResourceSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/FilenameSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/NameSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/ReleaseLevelSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/StandardSelections.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/TypeSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionConstraintsSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/DownloaderTool.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoriesTool.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoryTool.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/ResourceTool.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/Tool.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/RuperConstants.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerChain.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerManager.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/IHandler.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparatorSequence.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparisonHelper.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/Flag.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagMap.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagSet.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericIdentifier.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericNamespace.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/IIdentifiable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/FileUtils.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/HtmlUtils.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/ResolvedFile.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/VfsUtils.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/VirtualResourceLocator.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/http/HttpClientUserAgent.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/AbstractVrlSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ChildVrlSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/MatchingVrlSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ProtocolVrlSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/IReferenceable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/NoSuchReferenceException.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceProxy.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceTable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpression.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionHelper.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/ChkSum.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/HashCodeManager.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/AllSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/CompositeSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelectable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectionHelper.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectorHandlerChain.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/AndSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/BooleanSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/NotSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/OrSelector.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/MessageConstants.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/Messages.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/IXMLAttribute.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLContext.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLEntryTable.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLException.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLGrouperElement.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLHandler.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLParser.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLTagConstants.java
   incubator/depot/trunk/ruper/src/java/org/apache/ruper/version/Version.java
   incubator/depot/trunk/ruper/src/sample/src/org/apache/depot/ruper/sample/HelloWorld.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/AntTasksTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/RepositoryToolTaskTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/SynchronizeTaskTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/DefaultResourceAnalyzerTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/ResourceAnalyzerTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/HttpClientTest.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/VfsTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/protocols/ProtocolOperationsManagerTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/query/QueryTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/repository/RepositoryTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/resource/ResourceTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FileHelper.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FindTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/SynchronizeTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/net/VirtualResourceLocatorTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/security/HashCodeManagerTest.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/CompositeSelectorTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/MockSelector.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/SelectionTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/AndSelectorTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/BooleanSelectorTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/NotSelectorTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/OrSelectorTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/text/MessageTests.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestChild.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestParent.java
   incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/XMLParserTests.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntInterface.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/ClassGeneratorTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/DirectoryVersionMarkerTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionIdentifierTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionMarkerTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBox.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxClassGenerator.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxGeneratorTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/AvailableTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/SetPropertyTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintCheckTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintClassGenerator.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformation.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformationSet.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionComparisonConstraintInformation.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionConstraintInformation.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionExistenceConstraintInformation.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionRangeConstraintInformation.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentCheckTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/DefaultVersionMarkerAttributes.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/NestedElement.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionFormatNestedElement.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerAttribute.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerNestedElement.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionNestedElement.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionSpecificationNestedElement.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/stamp/VersionMarkerGeneratorTask.java
   incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/util/AntLogListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/CompoundVersion.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/Version.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/VersionConstants.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/VersionError.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/VersionException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/VersionManager.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/VersionMarker.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntime.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntimeException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/analysis/Analyzer.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintConclusion.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintError.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintEvaluator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintFormatException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResult.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultIterator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultSet.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintSet.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IContextConstraint.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IVersionConstraint.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/Dependency.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionComparisonConstraint.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionConstraint.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionIdentifierConstraint.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionRangeConstraint.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionedConstraintResult.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/text/ConstraintTextFactory.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/ConstraintRegistry.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/ExtensionRegistry.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/Resolver.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/Reviewer.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContextStore.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionEnvironment.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionInformation.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionRegistry.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatList.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatPartsList.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/Collector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/FilenameCollector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestExtensionCollector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestVersionCollector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageExtensionCollector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageVersionCollector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/TextFileConstraintCollector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/VersionStampCollector.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoadContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoader.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/JarManifestVersionLoader.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadType.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoadContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoader.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoadContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoader.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/TextConstraintLoader.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/VersionLoadContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Construction.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Overview.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtension.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionInformation.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionLoadContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/generation/dom/DOMGenerator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/AbstractVersionMarkerClassGenerator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/ClassGenerator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/DependentVersionMarkerClassGenerator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/StandaloneVersionMarkerClassGenerator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersion.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionComparator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionMarker.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifier.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifierType.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImplementationConstants.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImporter.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/ReleaseLevel.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionData.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataComparator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElement.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementReverseComparator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementSet.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataComparison.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIncrementor.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIterator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRange.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRangeIterator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelComparison.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelIterator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelRange.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/impl/util/ApacheVersionMarkerDiffTool.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/ApacheVersionMarkerInterfaceProxy.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoFieldMethodEntity.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoInterface.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoMethodEntity.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/StandardPseudoInterface.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AnnotatedVersionMarkerBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AttributedVersionMarkerBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ComplexVersionBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/CompoundVersionBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ConstrainedVersionMarkerBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/DescribedVersionMarkerBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/LocatedVersionMarkerBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/QualifiedVersionBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/SimpleVersionBeanSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/log/ILogger.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/log/LogConstants.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/log/Logger.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/log/StandardLogListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AnnotatedVersionMarkerSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AttributedVersionMarkerSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ComplexVersionSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/CompoundVersionSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ConstrainedVersionMarkerSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/DescribedVersionMarkerSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/FieldVersionSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/LocatedVersionMarkerSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifiedVersionSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifierFieldsSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/signature/SimpleVersionSignature.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/ApacheVersionSpecification.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/DatestampedVersionSpecification.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/EclipseVersionSpecification.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/JavasoftVersionSpecification.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecification.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationFactory.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationImpl.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/JakartaCommonsVersionSpecification.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/MavenVersionSpecification.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormat.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatFactory.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/Mask.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/MaskElement.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/ApacheVersionFormat.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/DatestampedVersionFormat.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/EclipseVersionFormat.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/GenericVersionFormat.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JakartaCommonsVersionFormat.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JavasoftVersionFormat.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/VersionFormatImpl.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionTool.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionToolImpl.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/IndentWriter.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/Registry.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/SystemUtils.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/Triple.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/Tuple.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathPart.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathSet.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathWalker.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DirectoryListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DropListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileContentsListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/JarListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/ManifestListener.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/NameFilter.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLine.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLineParser.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Option.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Options.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/ParseException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntityList.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntryCollection.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/DebugUtils.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/Dumpable.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMConsumer.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMProducer.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMUtils.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/ClassLoaderContext.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/RelativelySafe.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/io/IOUtils.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/jar/JarManifestHelper.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/Annotation.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationIterator.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationScratchpad.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableError.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableRuntimeException.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableThrowable.java
   incubator/depot/trunk/version/src/java/core/org/apache/version/version/Version.java
   incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/available/VersionAvailableTaskTest.java
   incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintCheckTaskTest.java
   incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTaskTest.java
   incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/environment/EnvironmentTaskTest.java
   incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/stamp/VersionGeneratorTaskTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/VersionRuntimeTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/constraint/discovery/text/ConstraintTextTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/ExtensionRegistryTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionContextTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionInformationTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionRegistryTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/FilenameLoaderTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/LoadTypeTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/VersionRuntimeLoadingTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/extension/VirtualMachineExtensionInformationTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/formatting/ApacheVersionFormatTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/CompatibilityTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ImporterTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ResolverTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionIdentifierTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionImporterTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/ReleaseLevelTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataComparisonTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataConstructorTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataElementSetTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataMethodTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeIteratorTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeTest.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/sample/Version1.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/FieldMethodEntityBase1.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/InterfaceBase1.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/PseudoInterfaceTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/api/APISampleTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundAttributedSampleVersion.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundLocatedSampleVersion.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleVersion.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldMethodEntityTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldSampleTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldVersionSample.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/QualifiedFieldVersionSample.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/RegistryTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathContextTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathPartTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathSetTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerFilterTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerTests.java
   incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/dom/DOMTests.java
Log:
Change package names to org.apache.depot.(updater|version)

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ClasspathUpdater.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ClasspathUpdater.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ClasspathUpdater.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper;
+package org.apache.depot.updater;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.version.util.classpath.PathPart;
-import org.apache.version.util.classpath.PathSet;
+import org.apache.depot.version.util.classpath.PathPart;
+import org.apache.depot.version.util.classpath.PathSet;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/DefaultResourceUpdater.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/DefaultResourceUpdater.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/DefaultResourceUpdater.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper;
+package org.apache.depot.updater;
 
-import org.apache.ruper.impl.ResourceUpdaterIdentifier;
+import org.apache.depot.updater.impl.ResourceUpdaterIdentifier;
 
 
 
 /**
- * A DefaultResourceUpdater is a {@link org.apache.ruper.ResourceUpdater} with the
+ * A DefaultResourceUpdater is a {@link org.apache.depot.updater.ResourceUpdater} with the
  * default settings selected.
  * 
  * @see FileUpdater, DefaultResourceUpdater, StandardResourceUpdater

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileAssistant.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileAssistant.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileAssistant.java	Fri Mar 19 03:39:27 2004
@@ -13,15 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper;
+package org.apache.depot.updater;
 
-import org.apache.ruper.files.DefaultResourceFilenameAnalyzer;
-import org.apache.ruper.files.IResourceFilenameAnalyzer;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceSpecifier;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.updater.files.DefaultResourceFilenameAnalyzer;
+import org.apache.depot.updater.files.IResourceFilenameAnalyzer;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceSpecifier;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.version.util.SystemUtils;
 
 import java.io.File;
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileUpdater.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileUpdater.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/FileUpdater.java	Fri Mar 19 03:39:27 2004
@@ -14,31 +14,31 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper;
+package org.apache.depot.updater;
 
 import java.io.File;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.messaging.ResourceRequest;
-import org.apache.ruper.query.ResourceQuery;
-import org.apache.ruper.query.ResourceQueryHelper;
-import org.apache.ruper.query.ResourceResult;
-import org.apache.ruper.query.ResourceResultHelper;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositoryAttribute;
-import org.apache.ruper.repository.RepositoryConstants;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.repository.RepositorySetSortContext;
-import org.apache.ruper.repository.select.ActiveRepositorySelector;
-import org.apache.ruper.repository.select.LocalRepositorySelector;
-import org.apache.ruper.repository.select.RemoteRepositorySelector;
-import org.apache.ruper.util.flag.Flag;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.messaging.ResourceRequest;
+import org.apache.depot.updater.query.ResourceQuery;
+import org.apache.depot.updater.query.ResourceQueryHelper;
+import org.apache.depot.updater.query.ResourceResult;
+import org.apache.depot.updater.query.ResourceResultHelper;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositoryAttribute;
+import org.apache.depot.updater.repository.RepositoryConstants;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.repository.RepositorySetSortContext;
+import org.apache.depot.updater.repository.select.ActiveRepositorySelector;
+import org.apache.depot.updater.repository.select.LocalRepositorySelector;
+import org.apache.depot.updater.repository.select.RemoteRepositorySelector;
+import org.apache.depot.updater.util.flag.Flag;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ResourceUpdater.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ResourceUpdater.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ResourceUpdater.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper;
+package org.apache.depot.updater;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,30 +23,30 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.ruper.config.RuperConfig;
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.ruper.impl.RepositoryObject;
-import org.apache.ruper.impl.RepositoryWrapper;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.impl.ResourceUpdaterEngine;
-import org.apache.ruper.impl.ResourceUpdaterIdentifier;
-import org.apache.ruper.query.ResourceQuery;
-import org.apache.ruper.query.ResourceQueryHelper;
-import org.apache.ruper.query.ResourceResult;
-import org.apache.ruper.query.ResourceResultHelper;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.repository.RepositorySetSortContext;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.reference.IReferenceable;
-import org.apache.ruper.util.reference.NoSuchReferenceException;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.config.RuperConfig;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.updater.impl.RepositoryObject;
+import org.apache.depot.updater.impl.RepositoryWrapper;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.impl.ResourceUpdaterEngine;
+import org.apache.depot.updater.impl.ResourceUpdaterIdentifier;
+import org.apache.depot.updater.query.ResourceQuery;
+import org.apache.depot.updater.query.ResourceQueryHelper;
+import org.apache.depot.updater.query.ResourceResult;
+import org.apache.depot.updater.query.ResourceResultHelper;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.repository.RepositorySetSortContext;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.reference.IReferenceable;
+import org.apache.depot.updater.util.reference.NoSuchReferenceException;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * A ResourceUpdater is the main (low level) API into Ruper.

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperException.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperException.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperException.java	Fri Mar 19 03:39:27 2004
@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper;
+package org.apache.depot.updater;
 
-import org.apache.version.util.throwable.PortableException;
+import org.apache.depot.version.util.throwable.PortableException;
 
 public class RuperException extends PortableException {
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperRuntimeException.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperRuntimeException.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/RuperRuntimeException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper;
+package org.apache.depot.updater;
 
-import org.apache.version.util.throwable.PortableRuntimeException;
+import org.apache.depot.version.util.throwable.PortableRuntimeException;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/StandardResourceUpdater.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/StandardResourceUpdater.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/StandardResourceUpdater.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper;
+package org.apache.depot.updater;
 
-import org.apache.ruper.config.RuperConfig;
-import org.apache.ruper.impl.ResourceUpdaterIdentifier;
+import org.apache.depot.updater.config.RuperConfig;
+import org.apache.depot.updater.impl.ResourceUpdaterIdentifier;
 
 /**
- * A StandardResourceUpdater is a {@link org.apache.ruper.DefaultResourceUpdater }
+ * A StandardResourceUpdater is a {@link org.apache.depot.updater.DefaultResourceUpdater }
  * that configures itself from an XML configuration file.
  * 
  * 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RepositoryElement.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RepositoryElement.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RepositoryElement.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  * limitations under the License.
  * ========================================================================
  */
-package org.apache.ruper.ant.sandbox.chalko;
+package org.apache.depot.updater.ant.sandbox.chalko;
 
 import java.net.URL;
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/ResourceElement.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/ResourceElement.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/ResourceElement.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  * limitations under the License.
  * ========================================================================
  */
-package org.apache.ruper.ant.sandbox.chalko;
+package org.apache.depot.updater.ant.sandbox.chalko;
 import java.io.File;
 
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.resource.ResourceType;
-import org.apache.ruper.resource.select.TypeSelector;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.resource.ResourceType;
+import org.apache.depot.updater.resource.select.TypeSelector;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
 import org.apache.tools.ant.Project;
-import org.apache.version.Version;
+import org.apache.depot.version.Version;
 /**
  * @version $Revision: $
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperFileSet.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperFileSet.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperFileSet.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  * limitations under the License.
  * ========================================================================
  */
-package org.apache.ruper.ant.sandbox.chalko;
+package org.apache.depot.updater.ant.sandbox.chalko;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.FileScanner;
 import org.apache.tools.ant.Project;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperSet.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperSet.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/sandbox/chalko/RuperSet.java	Fri Mar 19 03:39:27 2004
@@ -14,25 +14,25 @@
  * limitations under the License.
  * ========================================================================
  */
-package org.apache.ruper.ant.sandbox.chalko;
+package org.apache.depot.updater.ant.sandbox.chalko;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.ruper.ResourceUpdater;
-import org.apache.ruper.RuperException;
-import org.apache.ruper.impl.RepositorySetWrapper;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.protocols.DefaultProtocolOperationsManager;
-import org.apache.ruper.query.DefaultQueryEngine;
-import org.apache.ruper.query.ResourceQuery;
-import org.apache.ruper.query.ResourceResult;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.compare.VersionComparator;
-import org.apache.ruper.util.io.ResolvedFile;
+import org.apache.depot.updater.ResourceUpdater;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.impl.RepositorySetWrapper;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.protocols.DefaultProtocolOperationsManager;
+import org.apache.depot.updater.query.DefaultQueryEngine;
+import org.apache.depot.updater.query.ResourceQuery;
+import org.apache.depot.updater.query.ResourceResult;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.compare.VersionComparator;
+import org.apache.depot.updater.util.io.ResolvedFile;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.FileScanner;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/RepositoryToolTask.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/RepositoryToolTask.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/RepositoryToolTask.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.ant.task;
+package org.apache.depot.updater.ant.task;
 
 import java.util.Iterator;
 import java.util.List;
@@ -22,17 +22,17 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.ruper.RuperException;
-import org.apache.ruper.impl.RepositoryWrapper;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.resource.ResourceSpecifier;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.select.AllSelector;
-import org.apache.version.ant.util.AntLogListener;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.impl.RepositoryWrapper;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.resource.ResourceSpecifier;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.select.AllSelector;
+import org.apache.depot.version.ant.util.AntLogListener;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/SynchronizeTask.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/SynchronizeTask.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/ant/task/SynchronizeTask.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.ant.task;
+package org.apache.depot.updater.ant.task;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.ruper.ResourceUpdater;
-import org.apache.ruper.RuperException;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.version.ant.util.AntLogListener;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.ResourceUpdater;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.version.ant.util.AntLogListener;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/ConfigXMLEntryTable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/ConfigXMLEntryTable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/ConfigXMLEntryTable.java	Fri Mar 19 03:39:27 2004
@@ -13,15 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.config;
+package org.apache.depot.updater.config;
 
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.RepositoryAttribute;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.xml.XMLEntryTable;
-import org.apache.ruper.util.xml.XMLGrouperElement;
-import org.apache.ruper.util.xml.XMLTagConstants;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.RepositoryAttribute;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.xml.XMLEntryTable;
+import org.apache.depot.updater.util.xml.XMLGrouperElement;
+import org.apache.depot.updater.util.xml.XMLTagConstants;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/RuperConfig.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/RuperConfig.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/config/RuperConfig.java	Fri Mar 19 03:39:27 2004
@@ -14,20 +14,20 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.config;
+package org.apache.depot.updater.config;
 
 import java.io.File;
 import java.io.InputStream;
 
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.ruper.util.xml.XMLContext;
-import org.apache.ruper.util.xml.XMLEntryTable;
-import org.apache.ruper.util.xml.XMLParser;
-import org.apache.version.log.Logger;
-import org.apache.version.util.envsafe.ClassLoaderContext;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.updater.util.xml.XMLContext;
+import org.apache.depot.updater.util.xml.XMLEntryTable;
+import org.apache.depot.updater.util.xml.XMLParser;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.envsafe.ClassLoaderContext;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceFilenameAnalyzer.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,23 +25,23 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.RuperRuntimeException;
-import org.apache.ruper.monitor.FileEvent;
-import org.apache.ruper.monitor.Monitor;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceAttribute;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.resource.ResourceType;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.VersionException;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.RuperRuntimeException;
+import org.apache.depot.updater.monitor.FileEvent;
+import org.apache.depot.updater.monitor.Monitor;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceAttribute;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.resource.ResourceType;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceGroupFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceGroupFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/DefaultResourceGroupFilenameAnalyzer.java	Fri Mar 19 03:39:27 2004
@@ -14,22 +14,22 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.monitor.FileEvent;
-import org.apache.ruper.monitor.Monitor;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.monitor.FileEvent;
+import org.apache.depot.updater.monitor.Monitor;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/ExtensionTable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/ExtensionTable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/ExtensionTable.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.ruper.resource.ResourceType;
+import org.apache.depot.updater.resource.ResourceType;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceFilenameAnalyzer.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.resource.Resource;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.resource.Resource;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceGroupFilenameAnalyzer.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceGroupFilenameAnalyzer.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/IResourceGroupFilenameAnalyzer.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.resource.ResourceGroup;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.resource.ResourceGroup;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/TypeTable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/TypeTable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/files/TypeTable.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ReferenceManager.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ReferenceManager.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ReferenceManager.java	Fri Mar 19 03:39:27 2004
@@ -14,21 +14,21 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.identity.GenericNamespace;
-import org.apache.ruper.util.reference.IReferenceable;
-import org.apache.ruper.util.reference.NoSuchReferenceException;
-import org.apache.ruper.util.reference.ReferenceTable;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericNamespace;
+import org.apache.depot.updater.util.reference.IReferenceable;
+import org.apache.depot.updater.util.reference.NoSuchReferenceException;
+import org.apache.depot.updater.util.reference.ReferenceTable;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryObject.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryObject.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryObject.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.select.AllSelector;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.select.AllSelector;
 
 public class RepositoryObject {
 	

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryResourceObject.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryResourceObject.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryResourceObject.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
-import org.apache.ruper.resource.Resource;
+import org.apache.depot.updater.resource.Resource;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositorySetWrapper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositorySetWrapper.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositorySetWrapper.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.select.AllSelector;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.select.AllSelector;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryWrapper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryWrapper.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/RepositoryWrapper.java	Fri Mar 19 03:39:27 2004
@@ -14,27 +14,27 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
 import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.monitor.Monitor;
-import org.apache.ruper.monitor.ResourceEvent;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositoryCapability;
-import org.apache.ruper.repository.RepositoryException;
-import org.apache.ruper.repository.RepositoryManifest;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.monitor.Monitor;
+import org.apache.depot.updater.monitor.ResourceEvent;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositoryCapability;
+import org.apache.depot.updater.repository.RepositoryException;
+import org.apache.depot.updater.repository.RepositoryManifest;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContext.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContext.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContext.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
 import java.io.File;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.protocols.DefaultProtocolOperationsManager;
-import org.apache.ruper.protocols.ProtocolOperationsManager;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.reference.IReferenceable;
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.protocols.DefaultProtocolOperationsManager;
+import org.apache.depot.updater.protocols.ProtocolOperationsManager;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.reference.IReferenceable;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContextIdentifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContextIdentifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterContextIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterEngine.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterEngine.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterEngine.java	Fri Mar 19 03:39:27 2004
@@ -14,26 +14,26 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.messaging.ResourceRequest;
-import org.apache.ruper.protocols.DefaultProtocolOperationsManager;
-import org.apache.ruper.query.DefaultQueryEngine;
-import org.apache.ruper.query.ResourceQuery;
-import org.apache.ruper.query.ResourceResult;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositoryException;
-import org.apache.ruper.repository.RepositoryManager;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.repository.RepositorySetSortContext;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceIdentifier;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.messaging.ResourceRequest;
+import org.apache.depot.updater.protocols.DefaultProtocolOperationsManager;
+import org.apache.depot.updater.query.DefaultQueryEngine;
+import org.apache.depot.updater.query.ResourceQuery;
+import org.apache.depot.updater.query.ResourceResult;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositoryException;
+import org.apache.depot.updater.repository.RepositoryManager;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.repository.RepositorySetSortContext;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceIdentifier;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterIdentifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterIdentifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterOptions.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterOptions.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/impl/ResourceUpdaterOptions.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.impl;
+package org.apache.depot.updater.impl;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceAction.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceAction.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceAction.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.messaging;
+package org.apache.depot.updater.messaging;
 
-import org.apache.ruper.util.flag.Flag;
+import org.apache.depot.updater.util.flag.Flag;
 
 /**
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceRequest.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceRequest.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceRequest.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.messaging;
+package org.apache.depot.updater.messaging;
 
-import org.apache.ruper.query.ResourceQuery;
-import org.apache.ruper.util.flag.FlagSet;
+import org.apache.depot.updater.query.ResourceQuery;
+import org.apache.depot.updater.util.flag.FlagSet;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceResponse.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceResponse.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/messaging/ResourceResponse.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.messaging;
+package org.apache.depot.updater.messaging;
 
-import org.apache.ruper.query.ResourceResult;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.updater.query.ResourceResult;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/FileEvent.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/FileEvent.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/FileEvent.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.monitor;
+package org.apache.depot.updater.monitor;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/IMonitor.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/IMonitor.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/IMonitor.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.monitor;
+package org.apache.depot.updater.monitor;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/Monitor.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/Monitor.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/Monitor.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.monitor;
+package org.apache.depot.updater.monitor;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/MonitorEvent.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/MonitorEvent.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/MonitorEvent.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.monitor;
+package org.apache.depot.updater.monitor;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/ResourceEvent.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/ResourceEvent.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/ResourceEvent.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.monitor;
+package org.apache.depot.updater.monitor;
 
-import org.apache.ruper.resource.Resource;
+import org.apache.depot.updater.resource.Resource;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StandardMonitor.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StandardMonitor.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StandardMonitor.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.monitor;
+package org.apache.depot.updater.monitor;
 
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StatisticsMonitor.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StatisticsMonitor.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/monitor/StatisticsMonitor.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.monitor;
+package org.apache.depot.updater.monitor;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/DefaultProtocolOperationsManager.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/DefaultProtocolOperationsManager.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/DefaultProtocolOperationsManager.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols;
+package org.apache.depot.updater.protocols;
 
-import org.apache.ruper.RuperRuntimeException;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.envsafe.ClassLoaderContext;
+import org.apache.depot.updater.RuperRuntimeException;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.envsafe.ClassLoaderContext;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/IProtocolOperationsProvider.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/IProtocolOperationsProvider.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/IProtocolOperationsProvider.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols;
+package org.apache.depot.updater.protocols;
 
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/Protocol.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/Protocol.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/Protocol.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols;
+package org.apache.depot.updater.protocols;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/ProtocolOperationsManager.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/ProtocolOperationsManager.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/ProtocolOperationsManager.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols;
+package org.apache.depot.updater.protocols;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -24,19 +24,19 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.protocols.select.DestinationProtocolProviderSelector;
-import org.apache.ruper.protocols.select.SourceDestinationProtocolProviderSelector;
-import org.apache.ruper.protocols.select.SourceProtocolProviderSelector;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.chainprocess.HandlerManager;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.select.SelectorHandlerChain;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.protocols.select.DestinationProtocolProviderSelector;
+import org.apache.depot.updater.protocols.select.SourceDestinationProtocolProviderSelector;
+import org.apache.depot.updater.protocols.select.SourceProtocolProviderSelector;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.chainprocess.HandlerManager;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.select.SelectorHandlerChain;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/AbstractProtocolOperationsProvider.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/AbstractProtocolOperationsProvider.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/AbstractProtocolOperationsProvider.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.impl;
+package org.apache.depot.updater.protocols.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.protocols.IProtocolOperationsProvider;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.AllSelector;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.protocols.IProtocolOperationsProvider;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.AllSelector;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/BasicProtocolOperationsProvider.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/BasicProtocolOperationsProvider.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/BasicProtocolOperationsProvider.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.impl;
+package org.apache.depot.updater.protocols.impl;
 
 import java.net.URL;
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.protocols.Protocol;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.protocols.Protocol;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/FileProtocolOperationsProvider.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/FileProtocolOperationsProvider.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/FileProtocolOperationsProvider.java	Fri Mar 19 03:39:27 2004
@@ -13,19 +13,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.protocols.impl;
+package org.apache.depot.updater.protocols.impl;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.protocols.Protocol;
-import org.apache.ruper.util.io.FileUtils;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.protocols.Protocol;
+import org.apache.depot.updater.util.io.FileUtils;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/HttpClientProtocolOperationsProvider.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/HttpClientProtocolOperationsProvider.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/HttpClientProtocolOperationsProvider.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.impl;
+package org.apache.depot.updater.protocols.impl;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.protocols.Protocol;
-import org.apache.ruper.util.io.HtmlUtils;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.net.http.HttpClientUserAgent;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.version.util.io.IOUtils;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.protocols.Protocol;
+import org.apache.depot.updater.util.io.HtmlUtils;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.net.http.HttpClientUserAgent;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.version.util.io.IOUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/VfsProtocolOperationsProvider.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/VfsProtocolOperationsProvider.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/impl/VfsProtocolOperationsProvider.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.impl;
+package org.apache.depot.updater.protocols.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -22,11 +22,11 @@
 
 import org.apache.commons.vfs.FileObject;
 import org.apache.commons.vfs.FileSystemManager;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.protocols.Protocol;
-import org.apache.ruper.util.io.VfsUtils;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.protocols.Protocol;
+import org.apache.depot.updater.util.io.VfsUtils;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/AbstractProtocolProviderSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/AbstractProtocolProviderSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/AbstractProtocolProviderSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.select;
+package org.apache.depot.updater.protocols.select;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.util.chainprocess.IHandler;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.chainprocess.IHandler;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/DestinationProtocolProviderSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/DestinationProtocolProviderSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/DestinationProtocolProviderSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.select;
+package org.apache.depot.updater.protocols.select;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.protocols.IProtocolOperationsProvider;
+import org.apache.depot.updater.protocols.IProtocolOperationsProvider;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceDestinationProtocolProviderSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceDestinationProtocolProviderSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceDestinationProtocolProviderSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.select;
+package org.apache.depot.updater.protocols.select;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.protocols.IProtocolOperationsProvider;
+import org.apache.depot.updater.protocols.IProtocolOperationsProvider;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceProtocolProviderSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceProtocolProviderSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/protocols/select/SourceProtocolProviderSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols.select;
+package org.apache.depot.updater.protocols.select;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.protocols.IProtocolOperationsProvider;
+import org.apache.depot.updater.protocols.IProtocolOperationsProvider;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/DefaultQueryEngine.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/DefaultQueryEngine.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/DefaultQueryEngine.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.query;
+package org.apache.depot.updater.query;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,20 +22,20 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.impl.RepositorySetWrapper;
-import org.apache.ruper.impl.RepositoryWrapper;
-import org.apache.ruper.monitor.Monitor;
-import org.apache.ruper.monitor.ResourceEvent;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.resource.compare.StandardResourceComparisons;
-import org.apache.ruper.util.select.AllSelector;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.impl.RepositorySetWrapper;
+import org.apache.depot.updater.impl.RepositoryWrapper;
+import org.apache.depot.updater.monitor.Monitor;
+import org.apache.depot.updater.monitor.ResourceEvent;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.resource.compare.StandardResourceComparisons;
+import org.apache.depot.updater.util.select.AllSelector;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQuery.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQuery.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQuery.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.query;
+package org.apache.depot.updater.query;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.repository.RepositorySetSortContext;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.repository.RepositorySetSortContext;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQueryHelper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQueryHelper.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceQueryHelper.java	Fri Mar 19 03:39:27 2004
@@ -14,23 +14,23 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.query;
+package org.apache.depot.updater.query;
 
 import java.util.Comparator;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.resource.ResourceSpecifier;
-import org.apache.ruper.resource.compare.StandardResourceComparisons;
-import org.apache.ruper.resource.select.StandardSelections;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.select.AllSelector;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.resource.ResourceSpecifier;
+import org.apache.depot.updater.resource.compare.StandardResourceComparisons;
+import org.apache.depot.updater.resource.select.StandardSelections;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.select.AllSelector;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResult.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResult.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResult.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.query;
+package org.apache.depot.updater.query;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResultHelper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResultHelper.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/query/ResourceResultHelper.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.query;
+package org.apache.depot.updater.query;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.resource.Resource;
+import org.apache.depot.updater.resource.Resource;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractHierarchicalRepository.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractHierarchicalRepository.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractHierarchicalRepository.java	Fri Mar 19 03:39:27 2004
@@ -14,23 +14,23 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.resource.compare.StandardResourceComparisons;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.compare.ComparisonHelper;
-import org.apache.ruper.util.flag.Flag;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.resource.compare.StandardResourceComparisons;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.compare.ComparisonHelper;
+import org.apache.depot.updater.util.flag.Flag;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractRepository.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractRepository.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/AbstractRepository.java	Fri Mar 19 03:39:27 2004
@@ -14,30 +14,30 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.io.PrintWriter;
 import java.util.List;
 
-import org.apache.ruper.files.DefaultResourceFilenameAnalyzer;
-import org.apache.ruper.files.DefaultResourceGroupFilenameAnalyzer;
-import org.apache.ruper.files.IResourceFilenameAnalyzer;
-import org.apache.ruper.files.IResourceGroupFilenameAnalyzer;
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.net.select.MatchingVrlSelector;
-import org.apache.ruper.util.net.select.ProtocolVrlSelector;
-import org.apache.ruper.util.regexp.RegularExpressionHelper;
-import org.apache.ruper.util.select.ISelectable;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.select.logic.AndSelector;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.files.DefaultResourceFilenameAnalyzer;
+import org.apache.depot.updater.files.DefaultResourceGroupFilenameAnalyzer;
+import org.apache.depot.updater.files.IResourceFilenameAnalyzer;
+import org.apache.depot.updater.files.IResourceGroupFilenameAnalyzer;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.net.select.MatchingVrlSelector;
+import org.apache.depot.updater.util.net.select.ProtocolVrlSelector;
+import org.apache.depot.updater.util.regexp.RegularExpressionHelper;
+import org.apache.depot.updater.util.select.ISelectable;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.select.logic.AndSelector;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/DefaultRepository.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/DefaultRepository.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/DefaultRepository.java	Fri Mar 19 03:39:27 2004
@@ -14,24 +14,24 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.List;
 
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.net.select.ChildVrlSelector;
-import org.apache.ruper.util.reference.NoSuchReferenceException;
-import org.apache.ruper.util.select.AllSelector;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.select.SelectionHelper;
-import org.apache.ruper.util.select.logic.AndSelector;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.net.select.ChildVrlSelector;
+import org.apache.depot.updater.util.reference.NoSuchReferenceException;
+import org.apache.depot.updater.util.select.AllSelector;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.select.SelectionHelper;
+import org.apache.depot.updater.util.select.logic.AndSelector;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/IRepository.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/IRepository.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/IRepository.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.reference.IReferenceable;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.reference.IReferenceable;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/MockRepository.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/MockRepository.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/MockRepository.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.select.SelectionHelper;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.select.SelectionHelper;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttribute.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttribute.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttribute.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
-import org.apache.ruper.util.flag.Flag;
-import org.apache.ruper.util.xml.IXMLAttribute;
+import org.apache.depot.updater.util.flag.Flag;
+import org.apache.depot.updater.util.xml.IXMLAttribute;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttributeMap.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttributeMap.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryAttributeMap.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.List;
 
-import org.apache.ruper.util.flag.FlagMap;
+import org.apache.depot.updater.util.flag.FlagMap;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapability.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapability.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapability.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
-import org.apache.ruper.util.flag.Flag;
+import org.apache.depot.updater.util.flag.Flag;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapabilitySet.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapabilitySet.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryCapabilitySet.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryConstants.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryConstants.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryException.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryException.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
-import org.apache.ruper.RuperException;
+import org.apache.depot.updater.RuperException;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryIdentifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryIdentifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManager.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManager.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManager.java	Fri Mar 19 03:39:27 2004
@@ -14,20 +14,20 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.ruper.impl.ResourceUpdaterEngine;
-import org.apache.ruper.query.ResourceQuery;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.chainprocess.HandlerChain;
-import org.apache.ruper.util.chainprocess.HandlerManager;
-import org.apache.ruper.util.select.SelectorHandlerChain;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.updater.impl.ResourceUpdaterEngine;
+import org.apache.depot.updater.query.ResourceQuery;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.chainprocess.HandlerChain;
+import org.apache.depot.updater.util.chainprocess.HandlerManager;
+import org.apache.depot.updater.util.select.SelectorHandlerChain;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManifest.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManifest.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositoryManifest.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceType;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.version.Version;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceType;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySet.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySet.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySet.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.reference.IReferenceable;
-import org.apache.ruper.util.reference.NoSuchReferenceException;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.reference.IReferenceable;
+import org.apache.depot.updater.util.reference.NoSuchReferenceException;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetIdentifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetIdentifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContext.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContext.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContext.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.reference.IReferenceable;
-import org.apache.ruper.util.reference.NoSuchReferenceException;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.reference.IReferenceable;
+import org.apache.depot.updater.util.reference.NoSuchReferenceException;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContextIdentifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContextIdentifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySetSortContextIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySorterConfig.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySorterConfig.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/RepositorySorterConfig.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/AbstractRepositoryComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/AbstractRepositoryComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/AbstractRepositoryComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository.compare;
+package org.apache.depot.updater.repository.compare;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.util.chainprocess.IHandler;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.util.chainprocess.IHandler;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/PriorityComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/PriorityComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/compare/PriorityComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository.compare;
+package org.apache.depot.updater.repository.compare;
 
 import java.util.Comparator;
 
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositoryAttribute;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositoryAttribute;
 /**
  * 
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AbstractRepositorySelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AbstractRepositorySelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AbstractRepositorySelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository.select;
+package org.apache.depot.updater.repository.select;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.util.chainprocess.IHandler;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.chainprocess.IHandler;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/ActiveRepositorySelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/ActiveRepositorySelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/ActiveRepositorySelector.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository.select;
+package org.apache.depot.updater.repository.select;
 
-import org.apache.ruper.repository.RepositoryAttribute;
+import org.apache.depot.updater.repository.RepositoryAttribute;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AttributeBasedRepositorySelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AttributeBasedRepositorySelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/AttributeBasedRepositorySelector.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository.select;
+package org.apache.depot.updater.repository.select;
 
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositoryAttribute;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositoryAttribute;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/LocalRepositorySelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/LocalRepositorySelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/LocalRepositorySelector.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository.select;
+package org.apache.depot.updater.repository.select;
 
-import org.apache.ruper.repository.RepositoryAttribute;
+import org.apache.depot.updater.repository.RepositoryAttribute;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/RemoteRepositorySelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/RemoteRepositorySelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/repository/select/RemoteRepositorySelector.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository.select;
+package org.apache.depot.updater.repository.select;
 
-import org.apache.ruper.repository.RepositoryAttribute;
+import org.apache.depot.updater.repository.RepositoryAttribute;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/Resource.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/Resource.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/Resource.java	Fri Mar 19 03:39:27 2004
@@ -14,21 +14,21 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.util.flag.Flag;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.reference.IReferenceable;
-import org.apache.ruper.util.select.ISelectable;
-import org.apache.version.Version;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.util.flag.Flag;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.reference.IReferenceable;
+import org.apache.depot.updater.util.select.ISelectable;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttribute.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttribute.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttribute.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
-import org.apache.ruper.util.flag.Flag;
-import org.apache.ruper.util.xml.IXMLAttribute;
+import org.apache.depot.updater.util.flag.Flag;
+import org.apache.depot.updater.util.xml.IXMLAttribute;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttributeMap.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttributeMap.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceAttributeMap.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
 import java.util.List;
 
-import org.apache.ruper.util.flag.FlagMap;
+import org.apache.depot.updater.util.flag.FlagMap;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceConstants.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceConstants.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceGroup.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceGroup.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceGroup.java	Fri Mar 19 03:39:27 2004
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 /**
  * @author <a href="http://incubator.apache.org/depot">The Apache Incubator Depot Project</a>
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceIdentifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceIdentifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceLocator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceLocator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceLocator.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
 import java.io.PrintWriter;
 
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceSpecifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceSpecifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceSpecifier.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
 import java.io.PrintWriter;
 
-import org.apache.version.Version;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceType.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceType.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/ResourceType.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
-import org.apache.ruper.util.identity.GenericNamespace;
+import org.apache.depot.updater.util.identity.GenericNamespace;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 
 import java.util.Comparator;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceGroupComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceGroupComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/AbstractResourceGroupComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 
 import java.util.Comparator;
 
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/FilenameComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/FilenameComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/FilenameComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 
 import java.util.Comparator;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/NameComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/NameComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/NameComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 
 import java.util.Comparator;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/ResourceGroupNameComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/ResourceGroupNameComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/ResourceGroupNameComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 
 import java.util.Comparator;
 
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/StandardResourceComparisons.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/StandardResourceComparisons.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/StandardResourceComparisons.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 
-import org.apache.ruper.util.compare.ComparatorSequence;
+import org.apache.depot.updater.util.compare.ComparatorSequence;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/TypeComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/TypeComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/TypeComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 
 import java.util.Comparator;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/VersionComparator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/VersionComparator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/compare/VersionComparator.java	Fri Mar 19 03:39:27 2004
@@ -13,12 +13,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.resource.compare;
+package org.apache.depot.updater.resource.compare;
 import java.util.Comparator;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.Version;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.Version;
 /**
  * Compare two Resources by Version.
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/AbstractResourceSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/AbstractResourceSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/AbstractResourceSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/FilenameSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/FilenameSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/FilenameSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.regexp.RegularExpression;
-import org.apache.ruper.util.regexp.RegularExpressionSelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.regexp.RegularExpression;
+import org.apache.depot.updater.util.regexp.RegularExpressionSelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/NameSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/NameSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/NameSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.regexp.RegularExpression;
-import org.apache.ruper.util.regexp.RegularExpressionSelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.regexp.RegularExpression;
+import org.apache.depot.updater.util.regexp.RegularExpressionSelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/ReleaseLevelSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/ReleaseLevelSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/ReleaseLevelSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.Version;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/StandardSelections.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/StandardSelections.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/StandardSelections.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.ResourceSpecifier;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.select.logic.AndSelector;
+import org.apache.depot.updater.resource.ResourceSpecifier;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.select.logic.AndSelector;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/TypeSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/TypeSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/TypeSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceType;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceType;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionConstraintsSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionConstraintsSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionConstraintsSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.Version;
-import org.apache.version.constraint.ConstraintEvaluator;
-import org.apache.version.constraint.ConstraintResultSet;
-import org.apache.version.constraint.ConstraintSet;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.constraint.ConstraintEvaluator;
+import org.apache.depot.version.constraint.ConstraintResultSet;
+import org.apache.depot.version.constraint.ConstraintSet;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/resource/select/VersionSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource.select;
+package org.apache.depot.updater.resource.select;
 
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.Version;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.Version;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/DownloaderTool.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/DownloaderTool.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/DownloaderTool.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.tool;
+package org.apache.depot.updater.tool;
 
-import org.apache.ruper.ResourceUpdater;
-import org.apache.ruper.config.RuperConfig;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.version.util.cli.CommandLine;
-import org.apache.version.util.cli.Option;
+import org.apache.depot.updater.ResourceUpdater;
+import org.apache.depot.updater.config.RuperConfig;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.version.util.cli.CommandLine;
+import org.apache.depot.version.util.cli.Option;
 
 /**
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoriesTool.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoriesTool.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoriesTool.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.tool;
+package org.apache.depot.updater.tool;
 
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.version.util.cli.CommandLine;
-import org.apache.version.util.cli.Option;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.version.util.cli.CommandLine;
+import org.apache.depot.version.util.cli.Option;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoryTool.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoryTool.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/RepositoryTool.java	Fri Mar 19 03:39:27 2004
@@ -14,24 +14,24 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.tool;
+package org.apache.depot.updater.tool;
 
 import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.ResourceUpdater;
-import org.apache.ruper.impl.RepositoryWrapper;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.select.AllSelector;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.cli.CommandLine;
-import org.apache.version.util.cli.Option;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.ResourceUpdater;
+import org.apache.depot.updater.impl.RepositoryWrapper;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.select.AllSelector;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.cli.CommandLine;
+import org.apache.depot.version.util.cli.Option;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/ResourceTool.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/ResourceTool.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/ResourceTool.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.tool;
+package org.apache.depot.updater.tool;
 
-import org.apache.ruper.impl.ResourceUpdaterEngine;
-import org.apache.ruper.messaging.ResourceRequest;
-import org.apache.ruper.query.ResourceQueryHelper;
-import org.apache.ruper.query.ResourceResult;
-import org.apache.ruper.resource.ResourceSpecifier;
-import org.apache.version.util.cli.CommandLine;
-import org.apache.version.util.cli.Option;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.impl.ResourceUpdaterEngine;
+import org.apache.depot.updater.messaging.ResourceRequest;
+import org.apache.depot.updater.query.ResourceQueryHelper;
+import org.apache.depot.updater.query.ResourceResult;
+import org.apache.depot.updater.resource.ResourceSpecifier;
+import org.apache.depot.version.util.cli.CommandLine;
+import org.apache.depot.version.util.cli.Option;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  */

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/Tool.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/Tool.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/tool/Tool.java	Fri Mar 19 03:39:27 2004
@@ -14,24 +14,24 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.tool;
+package org.apache.depot.updater.tool;
 
 import java.io.PrintWriter;
 
-import org.apache.ruper.config.RuperConfig;
-import org.apache.ruper.monitor.Monitor;
-import org.apache.ruper.monitor.StatisticsMonitor;
-import org.apache.ruper.version.Version;
-import org.apache.version.log.LogConstants;
-import org.apache.version.log.Logger;
-import org.apache.version.log.StandardLogListener;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.cli.CommandLine;
-import org.apache.version.util.cli.CommandLineParser;
-import org.apache.version.util.cli.Option;
-import org.apache.version.util.cli.Options;
-import org.apache.version.util.cli.ParseException;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.config.RuperConfig;
+import org.apache.depot.updater.monitor.Monitor;
+import org.apache.depot.updater.monitor.StatisticsMonitor;
+import org.apache.depot.updater.version.Version;
+import org.apache.depot.version.log.LogConstants;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.log.StandardLogListener;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.cli.CommandLine;
+import org.apache.depot.version.util.cli.CommandLineParser;
+import org.apache.depot.version.util.cli.Option;
+import org.apache.depot.version.util.cli.Options;
+import org.apache.depot.version.util.cli.ParseException;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/RuperConstants.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/RuperConstants.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/RuperConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util;
+package org.apache.depot.updater.util;
 
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerChain.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerChain.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerChain.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.chainprocess;
+package org.apache.depot.updater.util.chainprocess;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerManager.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerManager.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/HandlerManager.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.chainprocess;
+package org.apache.depot.updater.util.chainprocess;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ruper.RuperException;
+import org.apache.depot.updater.RuperException;
 
 public class HandlerManager {
 	protected Map m_handlerChains;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/IHandler.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/IHandler.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/chainprocess/IHandler.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.chainprocess;
+package org.apache.depot.updater.util.chainprocess;
 
 import java.util.List;
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparatorSequence.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparatorSequence.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparatorSequence.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.compare;
+package org.apache.depot.updater.util.compare;
 
 import java.util.ArrayList;
 import java.util.Comparator;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparisonHelper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparisonHelper.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/compare/ComparisonHelper.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.compare;
+package org.apache.depot.updater.util.compare;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,8 +23,8 @@
 import java.util.List;
 import java.util.TreeSet;
 
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/Flag.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/Flag.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/Flag.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.flag;
+package org.apache.depot.updater.util.flag;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagMap.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagMap.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagMap.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.flag;
+package org.apache.depot.updater.util.flag;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagSet.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagSet.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/flag/FlagSet.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.flag;
+package org.apache.depot.updater.util.flag;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericIdentifier.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericIdentifier.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.identity;
+package org.apache.depot.updater.util.identity;
 
-import org.apache.ruper.util.select.ISelectable;
+import org.apache.depot.updater.util.select.ISelectable;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericNamespace.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericNamespace.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/GenericNamespace.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.identity;
+package org.apache.depot.updater.util.identity;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/IIdentifiable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/IIdentifiable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/identity/IIdentifiable.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.identity;
+package org.apache.depot.updater.util.identity;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/FileUtils.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/FileUtils.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/FileUtils.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.io;
+package org.apache.depot.updater.util.io;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,9 +25,9 @@
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 
-import org.apache.ruper.RuperRuntimeException;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.version.util.io.*;
+import org.apache.depot.updater.RuperRuntimeException;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.version.util.io.*;
 
 public class FileUtils {
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/HtmlUtils.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/HtmlUtils.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/HtmlUtils.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.io;
+package org.apache.depot.updater.util.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,10 +22,10 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.net.select.ChildVrlSelector;
-import org.apache.ruper.util.net.select.MatchingVrlSelector;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.net.select.ChildVrlSelector;
+import org.apache.depot.updater.util.net.select.MatchingVrlSelector;
+import org.apache.depot.updater.util.select.ISelector;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/ResolvedFile.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/ResolvedFile.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/ResolvedFile.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.io;
+package org.apache.depot.updater.util.io;
 
 import java.io.File;
 
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/VfsUtils.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/VfsUtils.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/io/VfsUtils.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.io;
+package org.apache.depot.updater.util.io;
 
 import java.io.File;
 import java.io.IOException;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/VirtualResourceLocator.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/VirtualResourceLocator.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/VirtualResourceLocator.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.net;
+package org.apache.depot.updater.util.net;
 
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.apache.ruper.protocols.Protocol;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.io.FileUtils;
-import org.apache.ruper.util.io.ResolvedFile;
+import org.apache.depot.updater.protocols.Protocol;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.io.FileUtils;
+import org.apache.depot.updater.util.io.ResolvedFile;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/http/HttpClientUserAgent.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/http/HttpClientUserAgent.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/http/HttpClientUserAgent.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.net.http;
+package org.apache.depot.updater.util.net.http;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -25,10 +25,10 @@
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.HeadMethod;
 import org.apache.commons.httpclient.util.HttpURLConnection;
-import org.apache.ruper.version.Version;
-import org.apache.version.log.Logger;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.io.IOUtils;
+import org.apache.depot.updater.version.Version;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.io.IOUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/AbstractVrlSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/AbstractVrlSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/AbstractVrlSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.net.select;
+package org.apache.depot.updater.util.net.select;
 
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.ISelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.ISelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ChildVrlSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ChildVrlSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ChildVrlSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.net.select;
+package org.apache.depot.updater.util.net.select;
 
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/MatchingVrlSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/MatchingVrlSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/MatchingVrlSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.net.select;
+package org.apache.depot.updater.util.net.select;
 
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.regexp.RegularExpression;
-import org.apache.ruper.util.regexp.RegularExpressionSelector;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.regexp.RegularExpression;
+import org.apache.depot.updater.util.regexp.RegularExpressionSelector;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ProtocolVrlSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ProtocolVrlSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/net/select/ProtocolVrlSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.net.select;
+package org.apache.depot.updater.util.net.select;
 
 import java.util.Set;
 
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/IReferenceable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/IReferenceable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/IReferenceable.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.reference;
+package org.apache.depot.updater.util.reference;
 
-import org.apache.ruper.util.identity.IIdentifiable;
+import org.apache.depot.updater.util.identity.IIdentifiable;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/NoSuchReferenceException.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/NoSuchReferenceException.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/NoSuchReferenceException.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.reference;
+package org.apache.depot.updater.util.reference;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.text.MessageConstants;
-import org.apache.ruper.util.text.Messages;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.text.MessageConstants;
+import org.apache.depot.updater.util.text.Messages;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceProxy.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceProxy.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceProxy.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.reference;
+package org.apache.depot.updater.util.reference;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceTable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceTable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/reference/ReferenceTable.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.reference;
+package org.apache.depot.updater.util.reference;
 
 import java.io.PrintWriter;
 import java.util.HashMap;
 
-import org.apache.ruper.util.identity.GenericIdentifier;
-import org.apache.ruper.util.identity.GenericNamespace;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.updater.util.identity.GenericIdentifier;
+import org.apache.depot.updater.util.identity.GenericNamespace;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpression.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpression.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpression.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.regexp;
+package org.apache.depot.updater.util.regexp;
 
 import java.util.HashMap;
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionHelper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionHelper.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionHelper.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.regexp;
+package org.apache.depot.updater.util.regexp;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/regexp/RegularExpressionSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.regexp;
+package org.apache.depot.updater.util.regexp;
 
-import org.apache.ruper.util.select.ISelectable;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.select.ISelectable;
+import org.apache.depot.updater.util.select.ISelector;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/ChkSum.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/ChkSum.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/ChkSum.java	Fri Mar 19 03:39:27 2004
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.util.security;
+package org.apache.depot.updater.util.security;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,9 +21,9 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import org.apache.ruper.RuperException;
+import org.apache.depot.updater.RuperException;
 
-import org.apache.version.log.Logger;
+import org.apache.depot.version.log.Logger;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/HashCodeManager.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/HashCodeManager.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/security/HashCodeManager.java	Fri Mar 19 03:39:27 2004
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.util.security;
+package org.apache.depot.updater.util.security;
 
 import java.io.BufferedReader;
 import java.io.File;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/AllSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/AllSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/AllSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/CompositeSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/CompositeSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/CompositeSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 public abstract class CompositeSelector implements ISelector, Dumpable {
 	// Would be much easier if we could use a LinkedHashSet, but that

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelectable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelectable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelectable.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/ISelector.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectionHelper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectionHelper.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectionHelper.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ruper.util.text.Messages;
-import org.apache.version.log.Logger;
+import org.apache.depot.updater.util.text.Messages;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectorHandlerChain.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectorHandlerChain.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/SelectorHandlerChain.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ruper.util.chainprocess.HandlerChain;
+import org.apache.depot.updater.util.chainprocess.HandlerChain;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/AndSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/AndSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/AndSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
 import java.util.Iterator;
 
-import org.apache.ruper.util.select.CompositeSelector;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.select.CompositeSelector;
+import org.apache.depot.updater.util.select.ISelector;
 
 public class AndSelector extends CompositeSelector {
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/BooleanSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/BooleanSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/BooleanSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.select.ISelector;
 
 public class BooleanSelector implements ISelector {
     private boolean m_result = false;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/NotSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/NotSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/NotSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.select.ISelector;
 
 public class NotSelector implements ISelector {
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/OrSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/OrSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/select/logic/OrSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
 import java.util.Iterator;
 
-import org.apache.ruper.util.select.CompositeSelector;
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.select.CompositeSelector;
+import org.apache.depot.updater.util.select.ISelector;
 
 public class OrSelector extends CompositeSelector{
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/MessageConstants.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/MessageConstants.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/MessageConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.text;
+package org.apache.depot.updater.util.text;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/Messages.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/Messages.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/text/Messages.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.text;
+package org.apache.depot.updater.util.text;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -24,7 +24,7 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * Formats messages.

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/IXMLAttribute.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/IXMLAttribute.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/IXMLAttribute.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLContext.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLContext.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLContext.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 import java.io.File;
 import java.util.ArrayList;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLEntryTable.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLEntryTable.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLEntryTable.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 import java.util.HashMap;
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLException.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLException.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
-import org.apache.ruper.RuperException;
+import org.apache.depot.updater.RuperException;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLGrouperElement.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLGrouperElement.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLGrouperElement.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLHandler.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLHandler.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLHandler.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 import java.lang.reflect.Method;
 import java.util.Stack;
 
-import org.apache.ruper.impl.ReferenceManager;
-import org.apache.version.log.Logger;
-import org.apache.version.util.envsafe.ClassLoaderContext;
+import org.apache.depot.updater.impl.ReferenceManager;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.envsafe.ClassLoaderContext;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLParser.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLParser.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLParser.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,8 +24,8 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.ruper.util.io.FileUtils;
-import org.apache.version.util.envsafe.ClassLoaderContext;
+import org.apache.depot.updater.util.io.FileUtils;
+import org.apache.depot.version.util.envsafe.ClassLoaderContext;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLTagConstants.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLTagConstants.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/util/xml/XMLTagConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/java/org/apache/ruper/version/Version.java
==============================================================================
--- incubator/depot/trunk/ruper/src/java/org/apache/ruper/version/Version.java	(original)
+++ incubator/depot/trunk/ruper/src/java/org/apache/ruper/version/Version.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.version;
+package org.apache.depot.updater.version;
 
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.data.ReleaseLevel;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/sample/src/org/apache/depot/ruper/sample/HelloWorld.java
==============================================================================
--- incubator/depot/trunk/ruper/src/sample/src/org/apache/depot/ruper/sample/HelloWorld.java	(original)
+++ incubator/depot/trunk/ruper/src/sample/src/org/apache/depot/ruper/sample/HelloWorld.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  * limitations under the License.
  * ========================================================================
  */
-package org.apache.depot.ruper.sample;
+package org.apache.depot.updater.sample;
 
 import org.apache.log4j.Category;
 

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  * limitations under the License.
  * ========================================================================
  */
-package org.apache.ruper.ant.sandbox.chalko;
+package org.apache.depot.updater.ant.sandbox.chalko;
 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;
 /**

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/AntTasksTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/AntTasksTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/AntTasksTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.ant.task;
+package org.apache.depot.updater.ant.task;
 
 import org.apache.tools.ant.BuildFileTest;
 

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/RepositoryToolTaskTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/RepositoryToolTaskTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/RepositoryToolTaskTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.ant.task;
+package org.apache.depot.updater.ant.task;
 
 import org.apache.tools.ant.BuildFileTest;
 

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/SynchronizeTaskTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/SynchronizeTaskTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/ant/task/SynchronizeTaskTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.ant.task;
+package org.apache.depot.updater.ant.task;
 
 import junit.framework.Assert;
 

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/DefaultResourceAnalyzerTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/DefaultResourceAnalyzerTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/DefaultResourceAnalyzerTests.java	Fri Mar 19 03:39:27 2004
@@ -13,19 +13,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceType;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.version.Version;
-import org.apache.version.impl.VersionImporter;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceType;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.impl.VersionImporter;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/ResourceAnalyzerTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/ResourceAnalyzerTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/files/ResourceAnalyzerTests.java	Fri Mar 19 03:39:27 2004
@@ -13,20 +13,20 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.files;
+package org.apache.depot.updater.files;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.ruper.RuperException;
-import org.apache.version.log.Logger;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceType;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceType;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/HttpClientTest.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/HttpClientTest.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/HttpClientTest.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.misc;
+package org.apache.depot.updater.misc;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/VfsTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/VfsTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/misc/VfsTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.misc;
+package org.apache.depot.updater.misc;
 
 import java.util.List;
 
 import org.apache.commons.vfs.FileObject;
-import org.apache.ruper.util.io.VfsUtils;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.util.io.VfsUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/protocols/ProtocolOperationsManagerTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/protocols/ProtocolOperationsManagerTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/protocols/ProtocolOperationsManagerTests.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.protocols;
+package org.apache.depot.updater.protocols;
 
 import junit.framework.TestCase;
 
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
-import org.apache.ruper.util.select.AllSelector;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.util.select.AllSelector;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/query/QueryTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/query/QueryTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/query/QueryTests.java	Fri Mar 19 03:39:27 2004
@@ -14,27 +14,27 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.query;
+package org.apache.depot.updater.query;
 
 import junit.framework.TestCase;
 
-import org.apache.ruper.RuperException;
-import org.apache.ruper.config.RuperConfig;
-import org.apache.ruper.impl.RepositorySetWrapper;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.resource.ResourceType;
-import org.apache.ruper.resource.compare.VersionComparator;
-import org.apache.ruper.resource.select.ReleaseLevelSelector;
-import org.apache.ruper.resource.select.TypeSelector;
-import org.apache.ruper.resource.select.VersionSelector;
-import org.apache.ruper.util.RuperConstants;
-import org.apache.ruper.util.select.logic.AndSelector;
-import org.apache.ruper.util.select.logic.OrSelector;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.updater.RuperException;
+import org.apache.depot.updater.config.RuperConfig;
+import org.apache.depot.updater.impl.RepositorySetWrapper;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.resource.ResourceType;
+import org.apache.depot.updater.resource.compare.VersionComparator;
+import org.apache.depot.updater.resource.select.ReleaseLevelSelector;
+import org.apache.depot.updater.resource.select.TypeSelector;
+import org.apache.depot.updater.resource.select.VersionSelector;
+import org.apache.depot.updater.util.RuperConstants;
+import org.apache.depot.updater.util.select.logic.AndSelector;
+import org.apache.depot.updater.util.select.logic.OrSelector;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/repository/RepositoryTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/repository/RepositoryTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/repository/RepositoryTests.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.repository;
+package org.apache.depot.updater.repository;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.ruper.impl.RepositoryWrapper;
-import org.apache.ruper.impl.ResourceUpdaterContext;
-import org.apache.ruper.resource.ResourceGroup;
-import org.apache.ruper.util.select.AllSelector;
+import org.apache.depot.updater.impl.RepositoryWrapper;
+import org.apache.depot.updater.impl.ResourceUpdaterContext;
+import org.apache.depot.updater.resource.ResourceGroup;
+import org.apache.depot.updater.util.select.AllSelector;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/resource/ResourceTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/resource/ResourceTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/resource/ResourceTests.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.resource;
+package org.apache.depot.updater.resource;
 
 import junit.framework.TestCase;
 
-import org.apache.version.log.Logger;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FileHelper.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FileHelper.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FileHelper.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.usecases;
+package org.apache.depot.updater.usecases;
 
 import java.io.File;
 import java.io.IOException;

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FindTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FindTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/FindTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.usecases;
+package org.apache.depot.updater.usecases;
 
 import java.io.File;
 import java.util.List;
@@ -23,16 +23,16 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.ruper.ResourceUpdater;
-import org.apache.ruper.query.ResourceQuery;
-import org.apache.ruper.query.ResourceQueryHelper;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.RepositorySet;
-import org.apache.ruper.resource.Resource;
-import org.apache.ruper.resource.ResourceSpecifier;
-import org.apache.ruper.util.io.ResolvedFile;
-import org.apache.ruper.util.net.VirtualResourceLocator;
+import org.apache.depot.updater.ResourceUpdater;
+import org.apache.depot.updater.query.ResourceQuery;
+import org.apache.depot.updater.query.ResourceQueryHelper;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.RepositorySet;
+import org.apache.depot.updater.resource.Resource;
+import org.apache.depot.updater.resource.ResourceSpecifier;
+import org.apache.depot.updater.util.io.ResolvedFile;
+import org.apache.depot.updater.util.net.VirtualResourceLocator;
 
 public class FindTests extends TestCase {
 	private ResolvedFile m_repoDir = ResolvedFile.resolve("transient/usecase/find/repo");

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/SynchronizeTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/SynchronizeTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/usecases/SynchronizeTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.usecases;
+package org.apache.depot.updater.usecases;
 
 import java.io.File;
 
@@ -22,13 +22,13 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.ruper.FileAssistant;
-import org.apache.ruper.FileUpdater;
-import org.apache.ruper.ResourceUpdater;
-import org.apache.ruper.impl.ResourceUpdaterIdentifier;
-import org.apache.ruper.repository.IRepository;
-import org.apache.ruper.repository.DefaultRepository;
-import org.apache.ruper.repository.RepositorySet;
+import org.apache.depot.updater.FileAssistant;
+import org.apache.depot.updater.FileUpdater;
+import org.apache.depot.updater.ResourceUpdater;
+import org.apache.depot.updater.impl.ResourceUpdaterIdentifier;
+import org.apache.depot.updater.repository.IRepository;
+import org.apache.depot.updater.repository.DefaultRepository;
+import org.apache.depot.updater.repository.RepositorySet;
 
 public class SynchronizeTests extends TestCase {
 	File m_repoDir = new File("transient/usecase/synchronize/repo");

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/net/VirtualResourceLocatorTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/net/VirtualResourceLocatorTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/net/VirtualResourceLocatorTests.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.net;
+package org.apache.depot.updater.util.net;
 
 import java.net.URL;
 
 import junit.framework.TestCase;
 
-import org.apache.ruper.protocols.Protocol;
-import org.apache.ruper.util.io.ResolvedFile;
+import org.apache.depot.updater.protocols.Protocol;
+import org.apache.depot.updater.util.io.ResolvedFile;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/security/HashCodeManagerTest.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/security/HashCodeManagerTest.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/security/HashCodeManagerTest.java	Fri Mar 19 03:39:27 2004
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.ruper.util.security;
+package org.apache.depot.updater.util.security;
 
 import java.io.File;
 import java.io.InputStream;

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/CompositeSelectorTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/CompositeSelectorTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/CompositeSelectorTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 import java.util.Iterator;
 

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/MockSelector.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/MockSelector.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/MockSelector.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 public class MockSelector implements ISelector {
     boolean m_result = false;

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/SelectionTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/SelectionTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/SelectionTests.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select;
+package org.apache.depot.updater.util.select;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.ruper.util.regexp.RegularExpressionSelector;
+import org.apache.depot.updater.util.regexp.RegularExpressionSelector;
 
 
 /**

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/AndSelectorTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/AndSelectorTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/AndSelectorTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.ruper.util.select.MockSelector;
+import org.apache.depot.updater.util.select.MockSelector;
 
 public class AndSelectorTests extends TestCase {
 

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/BooleanSelectorTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/BooleanSelectorTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/BooleanSelectorTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.ruper.util.select.ISelector;
+import org.apache.depot.updater.util.select.ISelector;
 
 public class BooleanSelectorTests extends TestCase {
 

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/NotSelectorTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/NotSelectorTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/NotSelectorTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/OrSelectorTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/OrSelectorTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/select/logic/OrSelectorTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.select.logic;
+package org.apache.depot.updater.util.select.logic;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.ruper.util.select.MockSelector;
+import org.apache.depot.updater.util.select.MockSelector;
 
 public class OrSelectorTests extends TestCase {
     OrSelector m_or = new OrSelector();

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/text/MessageTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/text/MessageTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/text/MessageTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.text;
+package org.apache.depot.updater.util.text;
 
 import java.util.Iterator;
 import java.util.List;

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestChild.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestChild.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestChild.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestParent.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestParent.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/TestParent.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/XMLParserTests.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/XMLParserTests.java	(original)
+++ incubator/depot/trunk/ruper/src/test/org/apache/ruper/util/xml/XMLParserTests.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.ruper.util.xml;
+package org.apache.depot.updater.util.xml;
 
 import java.io.File;
 import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import org.apache.version.util.envsafe.ClassLoaderContext;
+import org.apache.depot.version.util.envsafe.ClassLoaderContext;
 
 public class XMLParserTests extends TestCase {
 

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntInterface.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntInterface.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntInterface.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant;
+package org.apache.depot.version.ant;
 
 import java.util.Iterator;
 
@@ -22,10 +22,10 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Task;
-import org.apache.version.constraint.ConstraintResult;
-import org.apache.version.constraint.ConstraintResultSet;
-import org.apache.version.util.note.Annotation;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.constraint.ConstraintResult;
+import org.apache.depot.version.constraint.ConstraintResultSet;
+import org.apache.depot.version.util.note.Annotation;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/AntTask.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant;
+package org.apache.depot.version.ant;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.version.ant.util.AntLogListener;
-import org.apache.version.log.Logger;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.ant.util.AntLogListener;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/ClassGeneratorTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/ClassGeneratorTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/ClassGeneratorTask.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant;
+package org.apache.depot.version.ant;
 
 import java.io.File;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.version.generation.source.ClassGenerator;
+import org.apache.depot.version.generation.source.ClassGenerator;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/DirectoryVersionMarkerTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/DirectoryVersionMarkerTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/DirectoryVersionMarkerTask.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant;
+package org.apache.depot.version.ant;
 
 import java.io.File;
 

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionIdentifierTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionIdentifierTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionIdentifierTask.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant;
+package org.apache.depot.version.ant;
 
 import org.apache.tools.ant.BuildException;
 

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionMarkerTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionMarkerTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/VersionMarkerTask.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant;
+package org.apache.depot.version.ant;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.version.CompoundVersion;
-import org.apache.version.Version;
-import org.apache.version.VersionMarker;
-import org.apache.version.ant.nested.VersionMarkerNestedElement;
-import org.apache.version.ant.nested.VersionNestedElement;
+import org.apache.depot.version.CompoundVersion;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.ant.nested.VersionMarkerNestedElement;
+import org.apache.depot.version.ant.nested.VersionNestedElement;
 
 //
 // :TODO: Create a version-available task w/ actions (like set property)

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBox.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBox.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBox.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.about;
+package org.apache.depot.version.ant.about;
 import java.awt.BorderLayout;
 import java.awt.Font;
 import java.awt.Frame;
@@ -33,7 +33,7 @@
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
 
-import org.apache.version.VersionMarker;
+import org.apache.depot.version.VersionMarker;
 
 /**
  * An abstract class to create a AboutBox for a program.

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxClassGenerator.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxClassGenerator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.about;
+package org.apache.depot.version.ant.about;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.version.generation.source.ClassGenerator;
-import org.apache.version.util.IndentWriter;
+import org.apache.depot.version.generation.source.ClassGenerator;
+import org.apache.depot.version.util.IndentWriter;
 
 /** 
  * Generate a Swing about box.

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxGeneratorTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxGeneratorTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/about/AboutBoxGeneratorTask.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.about;
+package org.apache.depot.version.ant.about;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.version.ant.ClassGeneratorTask;
-import org.apache.version.generation.source.ClassGenerator;
+import org.apache.depot.version.ant.ClassGeneratorTask;
+import org.apache.depot.version.generation.source.ClassGenerator;
 
 /** 
  * Generate a Swing about box.

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/AvailableTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/AvailableTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/AvailableTask.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.available;
+package org.apache.depot.version.ant.available;
 
 import java.util.Comparator;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.VersionRuntime;
-import org.apache.version.ant.VersionMarkerTask;
-import org.apache.version.context.VersionInformation;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.ant.VersionMarkerTask;
+import org.apache.depot.version.context.VersionInformation;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/SetPropertyTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/SetPropertyTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/available/SetPropertyTask.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.available;
+package org.apache.depot.version.ant.available;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.VersionRuntime;
-import org.apache.version.ant.VersionIdentifierTask;
-import org.apache.version.context.VersionInformation;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.ant.VersionIdentifierTask;
+import org.apache.depot.version.context.VersionInformation;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintCheckTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintCheckTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintCheckTask.java	Fri Mar 19 03:39:27 2004
@@ -14,20 +14,20 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.version.VersionException;
-import org.apache.version.ant.AntTask;
-import org.apache.version.constraint.ConstraintConclusion;
-import org.apache.version.constraint.ConstraintResult;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.context.VersionContext;
-import org.apache.version.context.VersionContextStore;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.ant.AntTask;
+import org.apache.depot.version.constraint.ConstraintConclusion;
+import org.apache.depot.version.constraint.ConstraintResult;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.context.VersionContextStore;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintClassGenerator.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintClassGenerator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,10 +22,10 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.generation.source.ClassGenerator;
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.util.IndentWriter;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.generation.source.ClassGenerator;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.util.IndentWriter;
 
 /**
  * Generate Constraints class. Version class contain information about

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTask.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
 import java.util.ArrayList;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.version.ant.ClassGeneratorTask;
-import org.apache.version.generation.source.ClassGenerator;
+import org.apache.depot.version.ant.ClassGeneratorTask;
+import org.apache.depot.version.generation.source.ClassGenerator;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformation.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformation.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
-import org.apache.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.IContextConstraint;
 
 
 /**

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformationSet.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformationSet.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/ConstraintInformationSet.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -23,11 +23,11 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
-import org.apache.version.ant.nested.NestedElement;
-import org.apache.version.constraint.ConstraintSet;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.discovery.loading.TextConstraintLoader;
-import org.apache.version.impl.data.util.VersionDataComparison;
+import org.apache.depot.version.ant.nested.NestedElement;
+import org.apache.depot.version.constraint.ConstraintSet;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.discovery.loading.TextConstraintLoader;
+import org.apache.depot.version.impl.data.util.VersionDataComparison;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionComparisonConstraintInformation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionComparisonConstraintInformation.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionComparisonConstraintInformation.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
-import org.apache.version.VersionException;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.impl.VersionComparisonConstraint;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.data.util.VersionDataComparison;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.impl.VersionComparisonConstraint;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.data.util.VersionDataComparison;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionConstraintInformation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionConstraintInformation.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionConstraintInformation.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
-import org.apache.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.VersionIdentifier;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionExistenceConstraintInformation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionExistenceConstraintInformation.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionExistenceConstraintInformation.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.impl.Dependency;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.impl.Dependency;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionRangeConstraintInformation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionRangeConstraintInformation.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/constraint/VersionRangeConstraintInformation.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.version.VersionException;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.impl.VersionRangeConstraint;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.util.VersionDataRange;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.impl.VersionRangeConstraint;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.util.VersionDataRange;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentCheckTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentCheckTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentCheckTask.java	Fri Mar 19 03:39:27 2004
@@ -14,20 +14,20 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.environment;
+package org.apache.depot.version.ant.environment;
 
 import java.io.File;
 import java.util.Iterator;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.version.VersionException;
-import org.apache.version.VersionRuntime;
-import org.apache.version.ant.AntTask;
-import org.apache.version.constraint.ConstraintConclusion;
-import org.apache.version.constraint.ConstraintResult;
-import org.apache.version.constraint.ConstraintResultSet;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.ant.AntTask;
+import org.apache.depot.version.constraint.ConstraintConclusion;
+import org.apache.depot.version.constraint.ConstraintResult;
+import org.apache.depot.version.constraint.ConstraintResultSet;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/environment/EnvironmentTask.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.environment;
+package org.apache.depot.version.ant.environment;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -25,25 +25,25 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.DOMElementWriter;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.VersionRuntime;
-import org.apache.version.ant.AntTask;
-import org.apache.version.constraint.ConstraintSet;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.context.ConstraintRegistry;
-import org.apache.version.context.ExtensionRegistry;
-import org.apache.version.context.VersionEnvironment;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.context.VersionRegistry;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.extension.VirtualMachineExtension;
-import org.apache.version.extension.VirtualMachineExtensionInformation;
-import org.apache.version.util.classpath.PathContext;
-import org.apache.version.util.classpath.PathPart;
-import org.apache.version.util.classpath.PathSet;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.ant.AntTask;
+import org.apache.depot.version.constraint.ConstraintSet;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.context.ConstraintRegistry;
+import org.apache.depot.version.context.ExtensionRegistry;
+import org.apache.depot.version.context.VersionEnvironment;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.context.VersionRegistry;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.extension.VirtualMachineExtension;
+import org.apache.depot.version.extension.VirtualMachineExtensionInformation;
+import org.apache.depot.version.util.classpath.PathContext;
+import org.apache.depot.version.util.classpath.PathPart;
+import org.apache.depot.version.util.classpath.PathSet;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 
 /**

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/DefaultVersionMarkerAttributes.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/DefaultVersionMarkerAttributes.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/DefaultVersionMarkerAttributes.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.nested;
+package org.apache.depot.version.ant.nested;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -26,7 +26,7 @@
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.version.VersionConstants;
+import org.apache.depot.version.VersionConstants;
 
 /**
  * @author $Author: arb_jack $

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/NestedElement.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/NestedElement.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/NestedElement.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.nested;
+package org.apache.depot.version.ant.nested;
 
 import org.apache.tools.ant.Location;
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.version.ant.AntInterface;
+import org.apache.depot.version.ant.AntInterface;
 
 public class NestedElement {
 	protected AntInterface m_ant = null;

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionFormatNestedElement.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionFormatNestedElement.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionFormatNestedElement.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.nested;
+package org.apache.depot.version.ant.nested;
 
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.version.VersionException;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.VersionFormatFactory;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.VersionFormatFactory;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerAttribute.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerAttribute.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerAttribute.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.nested;
+package org.apache.depot.version.ant.nested;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerNestedElement.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerNestedElement.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionMarkerNestedElement.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.nested;
+package org.apache.depot.version.ant.nested;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,12 +26,12 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Task;
-import org.apache.version.CompoundVersion;
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.CompoundVersion;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersionMarker;
 
 /**
  * 

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionNestedElement.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionNestedElement.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionNestedElement.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.nested;
+package org.apache.depot.version.ant.nested;
 
 import java.util.Date;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.version.CompoundVersion;
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.VersionSpecification;
+import org.apache.depot.version.CompoundVersion;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.VersionSpecification;
 
 /**
  * 

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionSpecificationNestedElement.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionSpecificationNestedElement.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/nested/VersionSpecificationNestedElement.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.nested;
+package org.apache.depot.version.ant.nested;
 
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.version.VersionException;
-import org.apache.version.specification.VersionSpecification;
-import org.apache.version.specification.VersionSpecificationFactory;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.specification.VersionSpecification;
+import org.apache.depot.version.specification.VersionSpecificationFactory;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/stamp/VersionMarkerGeneratorTask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/stamp/VersionMarkerGeneratorTask.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/stamp/VersionMarkerGeneratorTask.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.stamp;
+package org.apache.depot.version.ant.stamp;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.version.VersionMarker;
-import org.apache.version.ant.ClassGeneratorTask;
-import org.apache.version.generation.source.ClassGenerator;
-import org.apache.version.generation.source.DependentVersionMarkerClassGenerator;
-import org.apache.version.generation.source.StandaloneVersionMarkerClassGenerator;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.ant.ClassGeneratorTask;
+import org.apache.depot.version.generation.source.ClassGenerator;
+import org.apache.depot.version.generation.source.DependentVersionMarkerClassGenerator;
+import org.apache.depot.version.generation.source.StandaloneVersionMarkerClassGenerator;
 
 /**
  * Generate Version class.

Modified: incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/util/AntLogListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/util/AntLogListener.java	(original)
+++ incubator/depot/trunk/version/src/java/ant/org/apache/version/ant/util/AntLogListener.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.util;
+package org.apache.depot.version.ant.util;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
-import org.apache.version.log.ILogger;
-import org.apache.version.log.LogConstants;
+import org.apache.depot.version.log.ILogger;
+import org.apache.depot.version.log.LogConstants;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/CompoundVersion.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/CompoundVersion.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/CompoundVersion.java	Fri Mar 19 03:39:27 2004
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.version;
+package org.apache.depot.version;
 
 import java.util.Date;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/Version.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/Version.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/Version.java	Fri Mar 19 03:39:27 2004
@@ -15,11 +15,11 @@
  */
 
 
-package org.apache.version;
+package org.apache.depot.version;
 
 import java.util.Comparator;
 
-import org.apache.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersion;
 
 
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/VersionConstants.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/VersionConstants.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/VersionConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version;
+package org.apache.depot.version;
 
-import org.apache.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.VersionImplementationConstants;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/VersionError.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/VersionError.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/VersionError.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version;
+package org.apache.depot.version;
 
-import org.apache.version.util.throwable.PortableError;
+import org.apache.depot.version.util.throwable.PortableError;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/VersionException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/VersionException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/VersionException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version;
+package org.apache.depot.version;
 
-import org.apache.version.util.throwable.PortableException;
+import org.apache.depot.version.util.throwable.PortableException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/VersionManager.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/VersionManager.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/VersionManager.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version;
+package org.apache.depot.version;
 
-import org.apache.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.ApacheVersionMarker;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/VersionMarker.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/VersionMarker.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/VersionMarker.java	Fri Mar 19 03:39:27 2004
@@ -15,14 +15,14 @@
  */
 
 
-package org.apache.version;
+package org.apache.depot.version;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
 
 // :TODO: Based upon thoughts from Anou..
 //

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntime.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntime.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntime.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version;
+package org.apache.depot.version;
 
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -24,21 +24,21 @@
 import java.io.Writer;
 import java.util.HashMap;
 
-import org.apache.version.analysis.Analyzer;
-import org.apache.version.constraint.ConstraintEvaluator;
-import org.apache.version.constraint.ConstraintResultSet;
-import org.apache.version.context.ConstraintRegistry;
-import org.apache.version.context.Reviewer;
-import org.apache.version.context.VersionContext;
-import org.apache.version.context.VersionContextStore;
-import org.apache.version.context.VersionEnvironment;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.context.VersionRegistry;
-import org.apache.version.util.classpath.PathContext;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.dom.DOMUtils;
-import org.apache.version.util.io.IOUtils;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.analysis.Analyzer;
+import org.apache.depot.version.constraint.ConstraintEvaluator;
+import org.apache.depot.version.constraint.ConstraintResultSet;
+import org.apache.depot.version.context.ConstraintRegistry;
+import org.apache.depot.version.context.Reviewer;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.context.VersionContextStore;
+import org.apache.depot.version.context.VersionEnvironment;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.context.VersionRegistry;
+import org.apache.depot.version.util.classpath.PathContext;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.dom.DOMUtils;
+import org.apache.depot.version.util.io.IOUtils;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntimeException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntimeException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/VersionRuntimeException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version;
+package org.apache.depot.version;
 
-import org.apache.version.util.throwable.PortableRuntimeException;
+import org.apache.depot.version.util.throwable.PortableRuntimeException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/analysis/Analyzer.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/analysis/Analyzer.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/analysis/Analyzer.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.analysis;
+package org.apache.depot.version.analysis;
 
 import java.util.Iterator;
 
-import org.apache.version.Version;
-import org.apache.version.VersionMarker;
-import org.apache.version.context.VersionEnvironment;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.context.VersionRegistry;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.context.VersionEnvironment;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.context.VersionRegistry;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintConclusion.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintConclusion.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintConclusion.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
 import java.util.ArrayList;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintError.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintError.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintError.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
-import org.apache.version.VersionError;
+import org.apache.depot.version.VersionError;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintEvaluator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintEvaluator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintEvaluator.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
 import java.util.Iterator;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.VersionRuntime;
-import org.apache.version.context.ConstraintRegistry;
-import org.apache.version.context.VersionContext;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.context.ConstraintRegistry;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintFormatException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintFormatException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintFormatException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResult.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResult.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResult.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
 import java.io.PrintWriter;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultIterator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultIterator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultIterator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
 import java.util.Iterator;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultSet.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultSet.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintResultSet.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.version.util.collection.EntityList;
+import org.apache.depot.version.util.collection.EntityList;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintSet.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintSet.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/ConstraintSet.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
 import java.util.Collection;
 
-import org.apache.version.util.collection.EntityList;
+import org.apache.depot.version.util.collection.EntityList;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IContextConstraint.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IContextConstraint.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IContextConstraint.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
-import org.apache.version.VersionException;
-import org.apache.version.context.VersionContext;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IVersionConstraint.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IVersionConstraint.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/IVersionConstraint.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint;
+package org.apache.depot.version.constraint;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/Dependency.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/Dependency.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/Dependency.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.impl;
+package org.apache.depot.version.constraint.impl;
 
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionComparisonConstraint.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionComparisonConstraint.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionComparisonConstraint.java	Fri Mar 19 03:39:27 2004
@@ -14,21 +14,21 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.impl;
+package org.apache.depot.version.constraint.impl;
 
 import java.io.PrintWriter;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.constraint.ConstraintConclusion;
-import org.apache.version.constraint.ConstraintResult;
-import org.apache.version.context.VersionContext;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.data.util.VersionDataComparison;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.constraint.ConstraintConclusion;
+import org.apache.depot.version.constraint.ConstraintResult;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.data.util.VersionDataComparison;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionConstraint.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionConstraint.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionConstraint.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.impl;
+package org.apache.depot.version.constraint.impl;
 
-import org.apache.version.Version;
-import org.apache.version.impl.VersionIdentifier;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.impl.VersionIdentifier;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionIdentifierConstraint.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionIdentifierConstraint.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionIdentifierConstraint.java	Fri Mar 19 03:39:27 2004
@@ -14,21 +14,21 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.impl;
+package org.apache.depot.version.constraint.impl;
 
 import java.io.PrintWriter;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.constraint.ConstraintConclusion;
-import org.apache.version.constraint.ConstraintResult;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.IVersionConstraint;
-import org.apache.version.context.VersionContext;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.constraint.ConstraintConclusion;
+import org.apache.depot.version.constraint.ConstraintResult;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.IVersionConstraint;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionRangeConstraint.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionRangeConstraint.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionRangeConstraint.java	Fri Mar 19 03:39:27 2004
@@ -14,22 +14,22 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.impl;
+package org.apache.depot.version.constraint.impl;
 
 import java.io.PrintWriter;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.constraint.ConstraintConclusion;
-import org.apache.version.constraint.ConstraintResult;
-import org.apache.version.context.VersionContext;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.data.util.VersionDataRange;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.constraint.ConstraintConclusion;
+import org.apache.depot.version.constraint.ConstraintResult;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.data.util.VersionDataRange;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionedConstraintResult.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionedConstraintResult.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/impl/VersionedConstraintResult.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.impl;
+package org.apache.depot.version.constraint.impl;
 
 import java.io.PrintWriter;
 
-import org.apache.version.Version;
-import org.apache.version.constraint.ConstraintConclusion;
-import org.apache.version.constraint.ConstraintResult;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.constraint.ConstraintConclusion;
+import org.apache.depot.version.constraint.ConstraintResult;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/text/ConstraintTextFactory.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/text/ConstraintTextFactory.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/constraint/text/ConstraintTextFactory.java	Fri Mar 19 03:39:27 2004
@@ -14,20 +14,20 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.text;
+package org.apache.depot.version.constraint.text;
 
 import java.util.StringTokenizer;
 
-import org.apache.version.VersionException;
-import org.apache.version.constraint.ConstraintFormatException;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.impl.Dependency;
-import org.apache.version.constraint.impl.VersionComparisonConstraint;
-import org.apache.version.constraint.impl.VersionRangeConstraint;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.data.util.VersionDataComparison;
-import org.apache.version.impl.data.util.VersionDataRange;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.constraint.ConstraintFormatException;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.impl.Dependency;
+import org.apache.depot.version.constraint.impl.VersionComparisonConstraint;
+import org.apache.depot.version.constraint.impl.VersionRangeConstraint;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.data.util.VersionDataComparison;
+import org.apache.depot.version.impl.data.util.VersionDataRange;
 
 /**
  * @author $Author: arb_jack $

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/ConstraintRegistry.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/ConstraintRegistry.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/ConstraintRegistry.java	Fri Mar 19 03:39:27 2004
@@ -15,11 +15,11 @@
  */
 
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
-import org.apache.version.constraint.ConstraintSet;
-import org.apache.version.log.Logger;
-import org.apache.version.util.Registry;
+import org.apache.depot.version.constraint.ConstraintSet;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.Registry;
 
 /**
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/ExtensionRegistry.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/ExtensionRegistry.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/ExtensionRegistry.java	Fri Mar 19 03:39:27 2004
@@ -15,11 +15,11 @@
  */
 
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
-import org.apache.version.extension.VirtualMachineExtensionInformation;
-import org.apache.version.extension.VirtualMachineExtensionLoadContext;
-import org.apache.version.util.Registry;
+import org.apache.depot.version.extension.VirtualMachineExtensionInformation;
+import org.apache.depot.version.extension.VirtualMachineExtensionLoadContext;
+import org.apache.depot.version.util.Registry;
 
 /**
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/Resolver.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/Resolver.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/Resolver.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
-import org.apache.version.VersionException;
-import org.apache.version.discovery.loading.PackageVersionLoader;
-import org.apache.version.discovery.loading.StampVersionLoader;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.log.Logger;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.discovery.loading.PackageVersionLoader;
+import org.apache.depot.version.discovery.loading.StampVersionLoader;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.log.Logger;
 
 //:TODO: Lots to do in here, to ensure correct behaviour in all
 // :TODO: cases. Lots of out of date code. Review line by line...

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/Reviewer.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/Reviewer.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/Reviewer.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import java.util.Iterator;
 
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContext.java	Fri Mar 19 03:39:27 2004
@@ -14,25 +14,25 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import java.io.PrintWriter;
 
-import org.apache.version.discovery.collecting.FilenameCollector;
-import org.apache.version.discovery.collecting.JarManifestExtensionCollector;
-import org.apache.version.discovery.collecting.JarManifestVersionCollector;
-import org.apache.version.discovery.collecting.PackageExtensionCollector;
-import org.apache.version.discovery.collecting.PackageVersionCollector;
-import org.apache.version.discovery.collecting.TextFileConstraintCollector;
-import org.apache.version.discovery.collecting.VersionStampCollector;
-import org.apache.version.log.Logger;
-import org.apache.version.util.classpath.PathContext;
-import org.apache.version.util.classpath.PathPart;
-import org.apache.version.util.classpath.PathSet;
-import org.apache.version.util.classpath.PathWalker;
-import org.apache.version.util.classpath.listener.DropListener;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.envsafe.ClassLoaderContext;
+import org.apache.depot.version.discovery.collecting.FilenameCollector;
+import org.apache.depot.version.discovery.collecting.JarManifestExtensionCollector;
+import org.apache.depot.version.discovery.collecting.JarManifestVersionCollector;
+import org.apache.depot.version.discovery.collecting.PackageExtensionCollector;
+import org.apache.depot.version.discovery.collecting.PackageVersionCollector;
+import org.apache.depot.version.discovery.collecting.TextFileConstraintCollector;
+import org.apache.depot.version.discovery.collecting.VersionStampCollector;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.classpath.PathContext;
+import org.apache.depot.version.util.classpath.PathPart;
+import org.apache.depot.version.util.classpath.PathSet;
+import org.apache.depot.version.util.classpath.PathWalker;
+import org.apache.depot.version.util.classpath.listener.DropListener;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.envsafe.ClassLoaderContext;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContextStore.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContextStore.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionContextStore.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.version.VersionError;
-import org.apache.version.util.classpath.PathContext;
-import org.apache.version.util.classpath.PathSet;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.util.classpath.PathContext;
+import org.apache.depot.version.util.classpath.PathSet;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionEnvironment.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionEnvironment.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionEnvironment.java	Fri Mar 19 03:39:27 2004
@@ -14,26 +14,26 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.VersionIdentifierType;
-import org.apache.version.impl.VersionImporter;
-import org.apache.version.log.Logger;
-import org.apache.version.specification.JavasoftVersionSpecification;
-import org.apache.version.util.classpath.PathContext;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMConsumer;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.VersionIdentifierType;
+import org.apache.depot.version.impl.VersionImporter;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.specification.JavasoftVersionSpecification;
+import org.apache.depot.version.util.classpath.PathContext;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMConsumer;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionInformation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionInformation.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionInformation.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -22,22 +22,22 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.version.Version;
-import org.apache.version.VersionError;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.VersionRuntimeException;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.impl.Dependency;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMConsumer;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.VersionRuntimeException;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.impl.Dependency;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMConsumer;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionRegistry.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionRegistry.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/context/VersionRegistry.java	Fri Mar 19 03:39:27 2004
@@ -15,19 +15,19 @@
  */
 
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.Registry;
-import org.apache.version.util.dom.DOMConsumer;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.Registry;
+import org.apache.depot.version.util.dom.DOMConsumer;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatList.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatList.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatList.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
 import java.util.Iterator;
 
-import org.apache.version.util.collection.EntityList;
+import org.apache.depot.version.util.collection.EntityList;
 
 /**
  * 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatPartsList.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatPartsList.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/ClassFormatPartsList.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
-import org.apache.version.util.collection.EntityList;
+import org.apache.depot.version.util.collection.EntityList;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/Collector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/Collector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/Collector.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
-import org.apache.version.context.VersionContext;
+import org.apache.depot.version.context.VersionContext;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/FilenameCollector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/FilenameCollector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/FilenameCollector.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
 import java.io.File;
 
-import org.apache.version.VersionException;
-import org.apache.version.context.VersionContext;
-import org.apache.version.discovery.loading.FilenameVersionLoader;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.log.Logger;
-import org.apache.version.util.classpath.listener.DirectoryListener;
-import org.apache.version.util.classpath.listener.JarListener;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.discovery.loading.FilenameVersionLoader;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.classpath.listener.DirectoryListener;
+import org.apache.depot.version.util.classpath.listener.JarListener;
 
 //
 // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestExtensionCollector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestExtensionCollector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestExtensionCollector.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
 import java.io.File;
 import java.util.Iterator;
@@ -22,11 +22,11 @@
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
-import org.apache.version.context.VersionContext;
-import org.apache.version.extension.VirtualMachineExtensionLoadContext;
-import org.apache.version.log.Logger;
-import org.apache.version.util.classpath.listener.ManifestListener;
-import org.apache.version.util.jar.JarManifestHelper;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.extension.VirtualMachineExtensionLoadContext;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.classpath.listener.ManifestListener;
+import org.apache.depot.version.util.jar.JarManifestHelper;
 
 //
 // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestVersionCollector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestVersionCollector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/JarManifestVersionCollector.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
 import java.io.File;
 import java.util.Iterator;
 import java.util.List;
 import java.util.jar.Manifest;
 
-import org.apache.version.context.VersionContext;
-import org.apache.version.discovery.loading.JarManifestVersionLoader;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.log.Logger;
-import org.apache.version.util.classpath.listener.ManifestListener;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.discovery.loading.JarManifestVersionLoader;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.classpath.listener.ManifestListener;
 
 //
 // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageExtensionCollector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageExtensionCollector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageExtensionCollector.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
-import org.apache.version.VersionException;
-import org.apache.version.context.VersionContext;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.extension.VirtualMachineExtension;
-import org.apache.version.extension.VirtualMachineExtensionLoadContext;
-import org.apache.version.log.Logger;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.extension.VirtualMachineExtension;
+import org.apache.depot.version.extension.VirtualMachineExtensionLoadContext;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageVersionCollector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageVersionCollector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/PackageVersionCollector.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
-import org.apache.version.VersionException;
-import org.apache.version.context.VersionContext;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.log.Logger;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/TextFileConstraintCollector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/TextFileConstraintCollector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/TextFileConstraintCollector.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
 import java.io.File;
 import java.io.InputStream;
 
-import org.apache.version.constraint.ConstraintSet;
-import org.apache.version.context.VersionContext;
-import org.apache.version.discovery.loading.TextConstraintLoader;
-import org.apache.version.log.Logger;
-import org.apache.version.util.classpath.listener.FileContentsListener;
-import org.apache.version.util.classpath.listener.NameFilter;
+import org.apache.depot.version.constraint.ConstraintSet;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.discovery.loading.TextConstraintLoader;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.classpath.listener.FileContentsListener;
+import org.apache.depot.version.util.classpath.listener.NameFilter;
 
 //
 // :TODO: Rework this to use the ClassLoader to load the JAR resource, since file system access may not match what a classloader provides.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/VersionStampCollector.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/VersionStampCollector.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/collecting/VersionStampCollector.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.collecting;
+package org.apache.depot.version.discovery.collecting;
 
 import java.io.File;
 import java.util.StringTokenizer;
 
-import org.apache.version.context.VersionContext;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.log.Logger;
-import org.apache.version.util.classpath.listener.FileListener;
-import org.apache.version.util.classpath.listener.NameFilter;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.classpath.listener.FileListener;
+import org.apache.depot.version.util.classpath.listener.NameFilter;
 
 //
 //:TODO: Rework this to use the *correct* ClassLoader (for the context) 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoadContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoadContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoadContext.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.File;
 import java.io.PrintWriter;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoader.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoader.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/FilenameVersionLoader.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.File;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.VersionIdentifierType;
-import org.apache.version.impl.VersionImporter;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.VersionIdentifierType;
+import org.apache.depot.version.impl.VersionImporter;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/JarManifestVersionLoader.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/JarManifestVersionLoader.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/JarManifestVersionLoader.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,14 +23,14 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.log.Logger;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.jar.JarManifestHelper;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.jar.JarManifestHelper;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadContext.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.PrintWriter;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadType.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadType.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/LoadType.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoadContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoadContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoadContext.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.PrintWriter;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoader.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoader.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/PackageVersionLoader.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.context.VersionContext;
-import org.apache.version.extension.VirtualMachineExtension;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.log.Logger;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.extension.VirtualMachineExtension;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoadContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoadContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoadContext.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.PrintWriter;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.interfacing.ApacheVersionMarkerInterfaceProxy;
-import org.apache.version.interfacing.PseudoInterface;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy;
+import org.apache.depot.version.interfacing.PseudoInterface;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoader.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoader.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/StampVersionLoader.java	Fri Mar 19 03:39:27 2004
@@ -14,22 +14,22 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.util.Iterator;
 
-import org.apache.version.VersionMarker;
-import org.apache.version.VersionRuntime;
-import org.apache.version.context.VersionContext;
-import org.apache.version.discovery.collecting.ClassFormatList;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.interfacing.ApacheVersionMarkerInterfaceProxy;
-import org.apache.version.interfacing.PseudoInterface;
-import org.apache.version.interfacing.StandardPseudoInterface;
-import org.apache.version.log.Logger;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.context.VersionContext;
+import org.apache.depot.version.discovery.collecting.ClassFormatList;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy;
+import org.apache.depot.version.interfacing.PseudoInterface;
+import org.apache.depot.version.interfacing.StandardPseudoInterface;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/TextConstraintLoader.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/TextConstraintLoader.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/TextConstraintLoader.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.FileReader;
 import java.io.InputStream;
@@ -23,12 +23,12 @@
 import java.io.Reader;
 import java.util.StringTokenizer;
 
-import org.apache.version.constraint.ConstraintFormatException;
-import org.apache.version.constraint.ConstraintSet;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.text.ConstraintTextFactory;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.constraint.ConstraintFormatException;
+import org.apache.depot.version.constraint.ConstraintSet;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.text.ConstraintTextFactory;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/VersionLoadContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/VersionLoadContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/discovery/loading/VersionLoadContext.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.PrintWriter;
 
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Construction.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Construction.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Construction.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.experimental.sample;
+package org.apache.depot.version.experimental.sample;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Overview.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Overview.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/experimental/sample/Overview.java	Fri Mar 19 03:39:27 2004
@@ -14,20 +14,20 @@
  *  limitations under the License.
  */
 
-package org.apache.version.experimental.sample;
+package org.apache.depot.version.experimental.sample;
 
 import java.io.PrintWriter;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionRuntime;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.impl.data.util.VersionDataIncrementor;
-import org.apache.version.impl.data.util.VersionDataRangeIterator;
-import org.apache.version.specification.VersionSpecification;
-import org.apache.version.specification.VersionSpecificationFactory;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.impl.data.util.VersionDataIncrementor;
+import org.apache.depot.version.impl.data.util.VersionDataRangeIterator;
+import org.apache.depot.version.specification.VersionSpecification;
+import org.apache.depot.version.specification.VersionSpecificationFactory;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtension.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtension.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtension.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.extension;
+package org.apache.depot.version.extension;
 
 import java.io.PrintWriter;
 import java.util.StringTokenizer;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.impl.VersionIdentifierType;
-import org.apache.version.impl.VersionImporter;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.VersionIdentifierType;
+import org.apache.depot.version.impl.VersionImporter;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionInformation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionInformation.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionInformation.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.extension;
+package org.apache.depot.version.extension;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.version.VersionError;
-import org.apache.version.VersionRuntimeException;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.VersionRuntimeException;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionLoadContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionLoadContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/extension/VirtualMachineExtensionLoadContext.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.extension;
+package org.apache.depot.version.extension;
 
 import java.io.PrintWriter;
 
-import org.apache.version.discovery.loading.LoadContext;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.discovery.loading.LoadContext;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/generation/dom/DOMGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/generation/dom/DOMGenerator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/generation/dom/DOMGenerator.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.generation.dom;
+package org.apache.depot.version.generation.dom;
 
-import org.apache.version.VersionMarker;
-import org.apache.version.context.VersionEnvironment;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.context.VersionEnvironment;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 
 /**

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/AbstractVersionMarkerClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/AbstractVersionMarkerClassGenerator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/AbstractVersionMarkerClassGenerator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.generation.source;
+package org.apache.depot.version.generation.source;
 
 import java.io.File;
 import java.net.UnknownHostException;
@@ -22,13 +22,13 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.version.CompoundVersion;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.interfacing.ApacheVersionMarkerInterfaceProxy;
-import org.apache.version.util.IndentWriter;
+import org.apache.depot.version.CompoundVersion;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy;
+import org.apache.depot.version.util.IndentWriter;
 
 /**
  * Generate Version class.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/ClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/ClassGenerator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/ClassGenerator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.generation.source;
+package org.apache.depot.version.generation.source;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -25,11 +25,11 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.apache.version.VersionException;
-import org.apache.version.interfacing.PseudoInterface;
-import org.apache.version.interfacing.PseudoMethodEntity;
-import org.apache.version.log.Logger;
-import org.apache.version.util.IndentWriter;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.interfacing.PseudoInterface;
+import org.apache.depot.version.interfacing.PseudoMethodEntity;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.IndentWriter;
 
 /**
  * Base class for generated Java sources files in ant.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/DependentVersionMarkerClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/DependentVersionMarkerClassGenerator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/DependentVersionMarkerClassGenerator.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.generation.source;
+package org.apache.depot.version.generation.source;
 
 import java.io.File;
 
-import org.apache.version.VersionMarker;
-import org.apache.version.interfacing.ApacheVersionMarkerInterfaceProxy;
-import org.apache.version.util.IndentWriter;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy;
+import org.apache.depot.version.util.IndentWriter;
 
 /**
  * Generate Version class.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/StandaloneVersionMarkerClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/StandaloneVersionMarkerClassGenerator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/generation/source/StandaloneVersionMarkerClassGenerator.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  * limitations under the License.
  * ========================================================================
  */
-package org.apache.version.generation.source;
+package org.apache.depot.version.generation.source;
 
 import java.io.File;
 
-import org.apache.version.VersionMarker;
-import org.apache.version.interfacing.ApacheVersionMarkerInterfaceProxy;
-import org.apache.version.interfacing.StandardPseudoInterface;
-import org.apache.version.util.IndentWriter;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy;
+import org.apache.depot.version.interfacing.StandardPseudoInterface;
+import org.apache.depot.version.util.IndentWriter;
 
 /**
  * Generate Version class.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersion.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersion.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersion.java	Fri Mar 19 03:39:27 2004
@@ -14,30 +14,30 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.io.PrintWriter;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.Map;
 
-import org.apache.version.CompoundVersion;
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.impl.data.util.VersionDataIncrementor;
-import org.apache.version.log.Logger;
-import org.apache.version.specification.VersionSpecification;
-import org.apache.version.specification.VersionSpecificationFactory;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMConsumer;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.CompoundVersion;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.impl.data.util.VersionDataIncrementor;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.specification.VersionSpecification;
+import org.apache.depot.version.specification.VersionSpecificationFactory;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMConsumer;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -755,7 +755,7 @@
 	* and returns an incremented version.
 	* 
 	* @see VersionDataElement
-	* @see org.apache.version.Version#increment(String)
+	* @see org.apache.depot.version.Version#increment(String)
 	*/
 	public Version increment(String element) throws VersionException {
 		// Extract which element of the version data, e.g. "major"

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionComparator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionComparator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.util.Comparator;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionMarker.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionMarker.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/ApacheVersionMarker.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -24,23 +24,23 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.version.CompoundVersion;
-import org.apache.version.Version;
-import org.apache.version.VersionConstants;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.VersionSpecification;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.specification.formatting.format.ApacheVersionFormat;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMConsumer;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.CompoundVersion;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionConstants;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.VersionSpecification;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMConsumer;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifier.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifier.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifier.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.io.PrintWriter;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifierType.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifierType.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionIdentifierType.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.io.PrintWriter;
 import java.util.HashMap;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImplementationConstants.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImplementationConstants.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImplementationConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImporter.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImporter.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/VersionImporter.java	Fri Mar 19 03:39:27 2004
@@ -14,21 +14,21 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.log.Logger;
-import org.apache.version.specification.VersionSpecification;
-import org.apache.version.specification.VersionSpecificationFactory;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.specification.VersionSpecification;
+import org.apache.depot.version.specification.VersionSpecificationFactory;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/ReleaseLevel.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/ReleaseLevel.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/ReleaseLevel.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionData.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionData.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionData.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.io.PrintWriter;
 import java.util.Comparator;
@@ -22,15 +22,15 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.version.VersionError;
-import org.apache.version.VersionException;
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMConsumer;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMConsumer;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataComparator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataComparator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.Comparator;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElement.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElement.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElement.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementReverseComparator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementReverseComparator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementReverseComparator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.Comparator;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementSet.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementSet.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/VersionDataElementSet.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.Iterator;
 import java.util.TreeSet;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataComparison.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataComparison.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataComparison.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data.util;
+package org.apache.depot.version.impl.data.util;
 
 // :TODO: Can we use ? import java.util.Comparator;
 
 import java.io.PrintWriter;
 
-import org.apache.version.VersionError;
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIncrementor.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIncrementor.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIncrementor.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data.util;
+package org.apache.depot.version.impl.data.util;
 
 import java.util.Iterator;
 
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIterator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIterator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataIterator.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data.util;
+package org.apache.depot.version.impl.data.util;
 
 import java.util.Iterator;
 
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRange.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRange.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRange.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data.util;
+package org.apache.depot.version.impl.data.util;
 
 import java.io.PrintWriter;
 
-import org.apache.version.VersionError;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRangeIterator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRangeIterator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/data/util/VersionDataRangeIterator.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data.util;
+package org.apache.depot.version.impl.data.util;
 
 import java.util.Iterator;
 
-import org.apache.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionData;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelComparison.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelComparison.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelComparison.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.release.util;
+package org.apache.depot.version.impl.release.util;
 
-import org.apache.version.VersionError;
-import org.apache.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.impl.data.ReleaseLevel;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelIterator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelIterator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelIterator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.release.util;
+package org.apache.depot.version.impl.release.util;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelRange.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelRange.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/release/util/ReleaseLevelRange.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.release.util;
+package org.apache.depot.version.impl.release.util;
 
-import org.apache.version.VersionError;
-import org.apache.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.impl.data.ReleaseLevel;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/impl/util/ApacheVersionMarkerDiffTool.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/impl/util/ApacheVersionMarkerDiffTool.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/impl/util/ApacheVersionMarkerDiffTool.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.util;
+package org.apache.depot.version.impl.util;
 
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/ApacheVersionMarkerInterfaceProxy.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/ApacheVersionMarkerInterfaceProxy.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/ApacheVersionMarkerInterfaceProxy.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -23,25 +23,25 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.version.VersionConstants;
-import org.apache.version.VersionException;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.interfacing.signature.AnnotatedVersionMarkerBeanSignature;
-import org.apache.version.interfacing.signature.AttributedVersionMarkerBeanSignature;
-import org.apache.version.interfacing.signature.CompoundVersionBeanSignature;
-import org.apache.version.interfacing.signature.ConstrainedVersionMarkerBeanSignature;
-import org.apache.version.interfacing.signature.DescribedVersionMarkerBeanSignature;
-import org.apache.version.interfacing.signature.LocatedVersionMarkerBeanSignature;
-import org.apache.version.interfacing.signature.QualifiedVersionBeanSignature;
-import org.apache.version.interfacing.signature.SimpleVersionBeanSignature;
-import org.apache.version.specification.ApacheVersionSpecification;
-import org.apache.version.specification.VersionSpecification;
-import org.apache.version.specification.VersionSpecificationFactory;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionConstants;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.interfacing.signature.AnnotatedVersionMarkerBeanSignature;
+import org.apache.depot.version.interfacing.signature.AttributedVersionMarkerBeanSignature;
+import org.apache.depot.version.interfacing.signature.CompoundVersionBeanSignature;
+import org.apache.depot.version.interfacing.signature.ConstrainedVersionMarkerBeanSignature;
+import org.apache.depot.version.interfacing.signature.DescribedVersionMarkerBeanSignature;
+import org.apache.depot.version.interfacing.signature.LocatedVersionMarkerBeanSignature;
+import org.apache.depot.version.interfacing.signature.QualifiedVersionBeanSignature;
+import org.apache.depot.version.interfacing.signature.SimpleVersionBeanSignature;
+import org.apache.depot.version.specification.ApacheVersionSpecification;
+import org.apache.depot.version.specification.VersionSpecification;
+import org.apache.depot.version.specification.VersionSpecificationFactory;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * The VersionDataInterfaceProxy applies interfaces to VersionData

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoFieldMethodEntity.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoFieldMethodEntity.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoFieldMethodEntity.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
 import java.lang.reflect.Field;
 import java.util.StringTokenizer;
 
-import org.apache.version.log.Logger;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoInterface.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoInterface.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoInterface.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -22,8 +22,8 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.apache.version.log.Logger;
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoMethodEntity.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoMethodEntity.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/PseudoMethodEntity.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.apache.version.log.Logger;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/StandardPseudoInterface.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/StandardPseudoInterface.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/StandardPseudoInterface.java	Fri Mar 19 03:39:27 2004
@@ -14,19 +14,19 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
-import org.apache.version.signature.AnnotatedVersionMarkerSignature;
-import org.apache.version.signature.AttributedVersionMarkerSignature;
-import org.apache.version.signature.ComplexVersionSignature;
-import org.apache.version.signature.CompoundVersionSignature;
-import org.apache.version.signature.ConstrainedVersionMarkerSignature;
-import org.apache.version.signature.DescribedVersionMarkerSignature;
-import org.apache.version.signature.FieldVersionSignature;
-import org.apache.version.signature.LocatedVersionMarkerSignature;
-import org.apache.version.signature.QualifiedVersionSignature;
-import org.apache.version.signature.QualifierFieldsSignature;
-import org.apache.version.signature.SimpleVersionSignature;
+import org.apache.depot.version.signature.AnnotatedVersionMarkerSignature;
+import org.apache.depot.version.signature.AttributedVersionMarkerSignature;
+import org.apache.depot.version.signature.ComplexVersionSignature;
+import org.apache.depot.version.signature.CompoundVersionSignature;
+import org.apache.depot.version.signature.ConstrainedVersionMarkerSignature;
+import org.apache.depot.version.signature.DescribedVersionMarkerSignature;
+import org.apache.depot.version.signature.FieldVersionSignature;
+import org.apache.depot.version.signature.LocatedVersionMarkerSignature;
+import org.apache.depot.version.signature.QualifiedVersionSignature;
+import org.apache.depot.version.signature.QualifierFieldsSignature;
+import org.apache.depot.version.signature.SimpleVersionSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AnnotatedVersionMarkerBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AnnotatedVersionMarkerBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AnnotatedVersionMarkerBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
 import java.util.List;
 
-import org.apache.version.signature.AnnotatedVersionMarkerSignature;
+import org.apache.depot.version.signature.AnnotatedVersionMarkerSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AttributedVersionMarkerBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AttributedVersionMarkerBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/AttributedVersionMarkerBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
 import java.util.Map;
 
-import org.apache.version.signature.AttributedVersionMarkerSignature;
+import org.apache.depot.version.signature.AttributedVersionMarkerSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ComplexVersionBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ComplexVersionBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ComplexVersionBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
 import java.util.ArrayList;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/CompoundVersionBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/CompoundVersionBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/CompoundVersionBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
 import java.util.Date;
 
-import org.apache.version.VersionException;
-import org.apache.version.signature.CompoundVersionSignature;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.signature.CompoundVersionSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ConstrainedVersionMarkerBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ConstrainedVersionMarkerBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/ConstrainedVersionMarkerBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
 import java.util.List;
 
-import org.apache.version.signature.ConstrainedVersionMarkerSignature;
+import org.apache.depot.version.signature.ConstrainedVersionMarkerSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/DescribedVersionMarkerBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/DescribedVersionMarkerBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/DescribedVersionMarkerBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
-import org.apache.version.signature.DescribedVersionMarkerSignature;
+import org.apache.depot.version.signature.DescribedVersionMarkerSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/LocatedVersionMarkerBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/LocatedVersionMarkerBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/LocatedVersionMarkerBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
-import org.apache.version.signature.LocatedVersionMarkerSignature;
+import org.apache.depot.version.signature.LocatedVersionMarkerSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/QualifiedVersionBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/QualifiedVersionBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/QualifiedVersionBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
-import org.apache.version.VersionException;
-import org.apache.version.signature.QualifiedVersionSignature;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.signature.QualifiedVersionSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/SimpleVersionBeanSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/SimpleVersionBeanSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/interfacing/signature/SimpleVersionBeanSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.signature;
+package org.apache.depot.version.interfacing.signature;
 
-import org.apache.version.signature.SimpleVersionSignature;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.signature.SimpleVersionSignature;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/log/ILogger.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/log/ILogger.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/log/ILogger.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.log;
+package org.apache.depot.version.log;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/log/LogConstants.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/log/LogConstants.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/log/LogConstants.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.log;
+package org.apache.depot.version.log;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/log/Logger.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/log/Logger.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/log/Logger.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.log;
+package org.apache.depot.version.log;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/log/StandardLogListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/log/StandardLogListener.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/log/StandardLogListener.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.log;
+package org.apache.depot.version.log;
 
 /**
  * @author anou_mana

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AnnotatedVersionMarkerSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AnnotatedVersionMarkerSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AnnotatedVersionMarkerSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 import java.util.List;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AttributedVersionMarkerSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AttributedVersionMarkerSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/AttributedVersionMarkerSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 import java.util.Map;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ComplexVersionSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ComplexVersionSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ComplexVersionSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 import java.util.ArrayList;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/CompoundVersionSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/CompoundVersionSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/CompoundVersionSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 import java.util.Date;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ConstrainedVersionMarkerSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ConstrainedVersionMarkerSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/ConstrainedVersionMarkerSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 import java.util.List;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/DescribedVersionMarkerSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/DescribedVersionMarkerSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/DescribedVersionMarkerSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/FieldVersionSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/FieldVersionSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/FieldVersionSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/LocatedVersionMarkerSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/LocatedVersionMarkerSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/LocatedVersionMarkerSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifiedVersionSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifiedVersionSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifiedVersionSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifierFieldsSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifierFieldsSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/QualifierFieldsSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/signature/SimpleVersionSignature.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/signature/SimpleVersionSignature.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/signature/SimpleVersionSignature.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.signature;
+package org.apache.depot.version.signature;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/ApacheVersionSpecification.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/ApacheVersionSpecification.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/ApacheVersionSpecification.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification;
+package org.apache.depot.version.specification;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.format.ApacheVersionFormat;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat;
 
 /**
  *
@@ -30,28 +30,28 @@
 public class ApacheVersionSpecification extends VersionSpecificationImpl {
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getId()
+     * @see org.apache.depot.version.specification.VersionSpecification#getId()
      */
     public String getId() {
         return VersionImplementationConstants.VERSION_PACKAGE;
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getDescription()
+     * @see org.apache.depot.version.specification.VersionSpecification#getDescription()
      */
     public String getDescription() {
         return "Apache Version Default Specification";
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getElementMask()
+     * @see org.apache.depot.version.specification.VersionSpecification#getElementMask()
      */
     public int getElementMask() {
         return VersionDataElementSet.DEFAULT.getElementMask();
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getVersionFormat()
+     * @see org.apache.depot.version.specification.VersionSpecification#getVersionFormat()
      */
     public VersionFormat getVersionFormat() {
         return new ApacheVersionFormat();

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/DatestampedVersionSpecification.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/DatestampedVersionSpecification.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/DatestampedVersionSpecification.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification;
+package org.apache.depot.version.specification;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.format.DatestampedVersionFormat;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.format.DatestampedVersionFormat;
 
 /**
  *
@@ -30,28 +30,28 @@
 public class DatestampedVersionSpecification extends VersionSpecificationImpl {
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getId()
+     * @see org.apache.depot.version.specification.VersionSpecification#getId()
      */
     public String getId() {
         return VersionImplementationConstants.VERSION_PACKAGE+".datestamped";
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getDescription()
+     * @see org.apache.depot.version.specification.VersionSpecification#getDescription()
      */
     public String getDescription() {
         return "Datestamped Version Default Specification";
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getElementMask()
+     * @see org.apache.depot.version.specification.VersionSpecification#getElementMask()
      */
     public int getElementMask() {
         return VersionDataElement.ELEMENT_BUILD_NUMBER;
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getVersionFormat()
+     * @see org.apache.depot.version.specification.VersionSpecification#getVersionFormat()
      */
     public VersionFormat getVersionFormat() {
         return new DatestampedVersionFormat();

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/EclipseVersionSpecification.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/EclipseVersionSpecification.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/EclipseVersionSpecification.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification;
+package org.apache.depot.version.specification;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.format.EclipseVersionFormat;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.format.EclipseVersionFormat;
 
 /**
  *
@@ -30,21 +30,21 @@
 public class EclipseVersionSpecification extends VersionSpecificationImpl {
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getId()
+     * @see org.apache.depot.version.specification.VersionSpecification#getId()
      */
     public String getId() {
         return VersionImplementationConstants.VERSION_PACKAGE;
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getDescription()
+     * @see org.apache.depot.version.specification.VersionSpecification#getDescription()
      */
     public String getDescription() {
         return "Eclipse Version Specification";
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getElementMask()
+     * @see org.apache.depot.version.specification.VersionSpecification#getElementMask()
      */
     public int getElementMask() {
         return VersionDataElement.ELEMENT_MAJOR
@@ -54,7 +54,7 @@
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getVersionFormat()
+     * @see org.apache.depot.version.specification.VersionSpecification#getVersionFormat()
      */
     public VersionFormat getVersionFormat() {
         return new EclipseVersionFormat();

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/JavasoftVersionSpecification.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/JavasoftVersionSpecification.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/JavasoftVersionSpecification.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification;
+package org.apache.depot.version.specification;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.format.JavasoftVersionFormat;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.format.JavasoftVersionFormat;
 
 /**
  *
@@ -30,28 +30,28 @@
 public class JavasoftVersionSpecification extends VersionSpecificationImpl {
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getId()
+     * @see org.apache.depot.version.specification.VersionSpecification#getId()
      */
     public String getId() {
         return VersionImplementationConstants.VERSION_PACKAGE;
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getDescription()
+     * @see org.apache.depot.version.specification.VersionSpecification#getDescription()
      */
     public String getDescription() {
         return "Javasoft Version Specification";
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getElementMask()
+     * @see org.apache.depot.version.specification.VersionSpecification#getElementMask()
      */
     public int getElementMask() {
         return VersionDataElementSet.DEFAULT.getElementMask();
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getVersionFormat()
+     * @see org.apache.depot.version.specification.VersionSpecification#getVersionFormat()
      */
     public VersionFormat getVersionFormat() {
         return new JavasoftVersionFormat();

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecification.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecification.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecification.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification;
+package org.apache.depot.version.specification;
 
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationFactory.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationFactory.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationFactory.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification;
+package org.apache.depot.version.specification;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.specification.experimental.JakartaCommonsVersionSpecification;
-import org.apache.version.specification.experimental.MavenVersionSpecification;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.specification.experimental.JakartaCommonsVersionSpecification;
+import org.apache.depot.version.specification.experimental.MavenVersionSpecification;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationImpl.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationImpl.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/VersionSpecificationImpl.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification;
+package org.apache.depot.version.specification;
 
 import java.io.PrintWriter;
 
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/JakartaCommonsVersionSpecification.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/JakartaCommonsVersionSpecification.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/JakartaCommonsVersionSpecification.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.experimental;
+package org.apache.depot.version.specification.experimental;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.specification.VersionSpecificationImpl;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.format.JakartaCommonsVersionFormat;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.specification.VersionSpecificationImpl;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.format.JakartaCommonsVersionFormat;
 
 /**
  *
@@ -31,28 +31,28 @@
 public class JakartaCommonsVersionSpecification extends VersionSpecificationImpl {
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getId()
+     * @see org.apache.depot.version.specification.VersionSpecification#getId()
      */
     public String getId() {
         return VersionImplementationConstants.VERSION_PACKAGE;
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getDescription()
+     * @see org.apache.depot.version.specification.VersionSpecification#getDescription()
      */
     public String getDescription() {
         return "Jakarta Commons Specification";
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getElementMask()
+     * @see org.apache.depot.version.specification.VersionSpecification#getElementMask()
      */
     public int getElementMask() {
         return VersionDataElementSet.DEFAULT.getElementMask();
     }
 
     /**
-     * @see org.apache.version.specification.VersionSpecification#getVersionFormat()
+     * @see org.apache.depot.version.specification.VersionSpecification#getVersionFormat()
      */
     public VersionFormat getVersionFormat() {
         return new JakartaCommonsVersionFormat();

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/MavenVersionSpecification.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/MavenVersionSpecification.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/experimental/MavenVersionSpecification.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.experimental;
+package org.apache.depot.version.specification.experimental;
 
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.specification.VersionSpecificationImpl;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.format.ApacheVersionFormat;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.specification.VersionSpecificationImpl;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat;
 
 /**
  *
@@ -30,28 +30,28 @@
 public class MavenVersionSpecification extends VersionSpecificationImpl {
 
 	/**
-	 * @see org.apache.version.specification.VersionSpecification#getId()
+	 * @see org.apache.depot.version.specification.VersionSpecification#getId()
 	 */
 	public String getId() {
 		return "org.apache.maven";
 	}
 
 	/**
-	 * @see org.apache.version.specification.VersionSpecification#getDescription()
+	 * @see org.apache.depot.version.specification.VersionSpecification#getDescription()
 	 */
 	public String getDescription() {
 		return "Maven Version Specification";
 	}
 
 	/**
-	 * @see org.apache.version.specification.VersionSpecification#getElementMask()
+	 * @see org.apache.depot.version.specification.VersionSpecification#getElementMask()
 	 */
 	public int getElementMask() {
 		return VersionDataElementSet.DEFAULT.getElementMask();
 	}
 
 	/**
-	 * @see org.apache.version.specification.VersionSpecification#getVersionFormat()
+	 * @see org.apache.depot.version.specification.VersionSpecification#getVersionFormat()
 	 */
 	public VersionFormat getVersionFormat() {
 		return new ApacheVersionFormat();

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormat.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormat.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormat.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting;
+package org.apache.depot.version.specification.formatting;
 
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting;
+package org.apache.depot.version.specification.formatting;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatFactory.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatFactory.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/VersionFormatFactory.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting;
+package org.apache.depot.version.specification.formatting;
 
 import java.util.HashMap;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.specification.formatting.format.JakartaCommonsVersionFormat;
-import org.apache.version.specification.formatting.format.JavasoftVersionFormat;
-import org.apache.version.specification.formatting.format.ApacheVersionFormat;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.specification.formatting.format.JakartaCommonsVersionFormat;
+import org.apache.depot.version.specification.formatting.format.JavasoftVersionFormat;
+import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/Mask.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/Mask.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/Mask.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.experimental;
+package org.apache.depot.version.specification.formatting.experimental;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -23,12 +23,12 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.log.Logger;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/MaskElement.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/MaskElement.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/experimental/MaskElement.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.experimental;
+package org.apache.depot.version.specification.formatting.experimental;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.VersionDataElement;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.VersionDataElement;
 
 //
 // :TODO: Experimental, not used yet.

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/ApacheVersionFormat.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/ApacheVersionFormat.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/ApacheVersionFormat.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.format;
+package org.apache.depot.version.specification.formatting.format;
 
 import java.util.StringTokenizer;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.log.Logger;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/DatestampedVersionFormat.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/DatestampedVersionFormat.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/DatestampedVersionFormat.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.format;
+package org.apache.depot.version.specification.formatting.format;
 
 import java.text.ParseException;
 import java.util.Date;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/EclipseVersionFormat.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/EclipseVersionFormat.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/EclipseVersionFormat.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.format;
+package org.apache.depot.version.specification.formatting.format;
 
 import java.util.StringTokenizer;
 
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.impl.data.VersionDataElementSet;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.impl.data.VersionDataElementSet;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/GenericVersionFormat.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/GenericVersionFormat.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/GenericVersionFormat.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.format;
+package org.apache.depot.version.specification.formatting.format;
 
-import org.apache.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.VersionImplementationConstants;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JakartaCommonsVersionFormat.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JakartaCommonsVersionFormat.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JakartaCommonsVersionFormat.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.format;
+package org.apache.depot.version.specification.formatting.format;
 
 import java.util.StringTokenizer;
 
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JavasoftVersionFormat.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JavasoftVersionFormat.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/JavasoftVersionFormat.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.format;
+package org.apache.depot.version.specification.formatting.format;
 
 import java.util.StringTokenizer;
 
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/VersionFormatImpl.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/VersionFormatImpl.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/specification/formatting/format/VersionFormatImpl.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.specification.formatting.format;
+package org.apache.depot.version.specification.formatting.format;
 
 import java.io.PrintWriter;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.impl.data.VersionDataElement;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.impl.data.VersionDataElement;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 
 /**
  * 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionTool.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionTool.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionTool.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.tool;
+package org.apache.depot.version.tool;
 
-import org.apache.version.log.LogConstants;
-import org.apache.version.log.Logger;
-import org.apache.version.log.StandardLogListener;
-import org.apache.version.util.cli.CommandLine;
-import org.apache.version.util.cli.CommandLineParser;
-import org.apache.version.util.cli.Option;
-import org.apache.version.util.cli.Options;
-import org.apache.version.util.cli.ParseException;
+import org.apache.depot.version.log.LogConstants;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.log.StandardLogListener;
+import org.apache.depot.version.util.cli.CommandLine;
+import org.apache.depot.version.util.cli.CommandLineParser;
+import org.apache.depot.version.util.cli.Option;
+import org.apache.depot.version.util.cli.Options;
+import org.apache.depot.version.util.cli.ParseException;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionToolImpl.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionToolImpl.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/tool/VersionToolImpl.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.tool;
+package org.apache.depot.version.tool;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.VersionRuntime;
-import org.apache.version.constraint.ConstraintResultSet;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.note.AnnotationScratchpad;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.constraint.ConstraintResultSet;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.note.AnnotationScratchpad;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/IndentWriter.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/IndentWriter.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/IndentWriter.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util;
+package org.apache.depot.version.util;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/Registry.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/Registry.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/Registry.java	Fri Mar 19 03:39:27 2004
@@ -15,14 +15,14 @@
  */
 
 
-package org.apache.version.util;
+package org.apache.depot.version.util;
 import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.TreeMap;
 
-import org.apache.version.VersionError;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  * @author ajack. 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/SystemUtils.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/SystemUtils.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/SystemUtils.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util;
+package org.apache.depot.version.util;
 
 import java.io.File;
 import java.io.PrintWriter;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/Triple.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/Triple.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/Triple.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util;
+package org.apache.depot.version.util;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/Tuple.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/Tuple.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/Tuple.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util;
+package org.apache.depot.version.util;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathContext.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import java.io.PrintWriter;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
-import org.apache.version.util.envsafe.ClassLoaderContext;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
+import org.apache.depot.version.util.envsafe.ClassLoaderContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathPart.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathPart.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathPart.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import java.io.File;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathSet.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathSet.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathSet.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -24,10 +24,10 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.version.log.Logger;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.collection.EntityList;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.collection.EntityList;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathWalker.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathWalker.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/PathWalker.java	Fri Mar 19 03:39:27 2004
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -28,15 +28,15 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.version.log.Logger;
-import org.apache.version.util.Tuple;
-import org.apache.version.util.classpath.listener.DirectoryListener;
-import org.apache.version.util.classpath.listener.DropListener;
-import org.apache.version.util.classpath.listener.FileContentsListener;
-import org.apache.version.util.classpath.listener.FileListener;
-import org.apache.version.util.classpath.listener.JarListener;
-import org.apache.version.util.classpath.listener.ManifestListener;
-import org.apache.version.util.classpath.listener.NameFilter;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.Tuple;
+import org.apache.depot.version.util.classpath.listener.DirectoryListener;
+import org.apache.depot.version.util.classpath.listener.DropListener;
+import org.apache.depot.version.util.classpath.listener.FileContentsListener;
+import org.apache.depot.version.util.classpath.listener.FileListener;
+import org.apache.depot.version.util.classpath.listener.JarListener;
+import org.apache.depot.version.util.classpath.listener.ManifestListener;
+import org.apache.depot.version.util.classpath.listener.NameFilter;
 
 //
 // :TODO: Load the JAR using the current classloader (to get right one)

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DirectoryListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DirectoryListener.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DirectoryListener.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath.listener;
+package org.apache.depot.version.util.classpath.listener;
 
 import java.io.File;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DropListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DropListener.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/DropListener.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath.listener;
+package org.apache.depot.version.util.classpath.listener;
 
-import org.apache.version.util.classpath.PathPart;
+import org.apache.depot.version.util.classpath.PathPart;
 
 
 /**

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileContentsListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileContentsListener.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileContentsListener.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath.listener;
+package org.apache.depot.version.util.classpath.listener;
 
 import java.io.File;
 import java.io.InputStream;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileListener.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/FileListener.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath.listener;
+package org.apache.depot.version.util.classpath.listener;
 
 import java.io.File;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/JarListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/JarListener.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/JarListener.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath.listener;
+package org.apache.depot.version.util.classpath.listener;
 
 import java.io.File;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/ManifestListener.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/ManifestListener.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/ManifestListener.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath.listener;
+package org.apache.depot.version.util.classpath.listener;
 
 import java.io.File;
 import java.util.jar.Manifest;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/NameFilter.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/NameFilter.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/classpath/listener/NameFilter.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath.listener;
+package org.apache.depot.version.util.classpath.listener;
 
 
 /**

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLine.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLine.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLine.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.cli;
+package org.apache.depot.version.util.cli;
 
 import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.version.util.collection.EntityList;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
+import org.apache.depot.version.util.collection.EntityList;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLineParser.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLineParser.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/CommandLineParser.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.cli;
+package org.apache.depot.version.util.cli;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Option.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Option.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Option.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.cli;
+package org.apache.depot.version.util.cli;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Options.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Options.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/Options.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.cli;
+package org.apache.depot.version.util.cli;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/ParseException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/ParseException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/cli/ParseException.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.cli;
+package org.apache.depot.version.util.cli;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntityList.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntityList.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntityList.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.collection;
+package org.apache.depot.version.util.collection;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntryCollection.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntryCollection.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/collection/EntryCollection.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.collection;
+package org.apache.depot.version.util.collection;
 
 import java.util.Collections;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/DebugUtils.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/DebugUtils.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/DebugUtils.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.debug;
+package org.apache.depot.version.util.debug;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/Dumpable.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/Dumpable.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/debug/Dumpable.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.debug;
+package org.apache.depot.version.util.debug;
 
 import java.io.PrintWriter;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMConsumer.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMConsumer.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMConsumer.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.dom;
+package org.apache.depot.version.util.dom;
 
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMProducer.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMProducer.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMProducer.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.dom;
+package org.apache.depot.version.util.dom;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMUtils.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMUtils.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/dom/DOMUtils.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.dom;
+package org.apache.depot.version.util.dom;
 
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -29,10 +29,10 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.apache.version.VersionException;
-import org.apache.version.log.Logger;
-import org.apache.version.util.SystemUtils;
-import org.apache.version.util.debug.DebugUtils;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.SystemUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/ClassLoaderContext.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/ClassLoaderContext.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/ClassLoaderContext.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.envsafe;
+package org.apache.depot.version.util.envsafe;
 
 import java.io.InputStream;
 
-import org.apache.version.VersionError;
-import org.apache.version.VersionException;
-import org.apache.version.log.Logger;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/RelativelySafe.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/RelativelySafe.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/envsafe/RelativelySafe.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.envsafe;
+package org.apache.depot.version.util.envsafe;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import org.apache.version.VersionError;
-import org.apache.version.log.Logger;
-import org.apache.version.util.SystemUtils;
+import org.apache.depot.version.VersionError;
+import org.apache.depot.version.log.Logger;
+import org.apache.depot.version.util.SystemUtils;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/io/IOUtils.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/io/IOUtils.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/io/IOUtils.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.io;
+package org.apache.depot.version.util.io;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/jar/JarManifestHelper.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/jar/JarManifestHelper.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/jar/JarManifestHelper.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.jar;
+package org.apache.depot.version.util.jar;
 
 import java.util.jar.Attributes;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.extension.VirtualMachineExtension;
-import org.apache.version.extension.VirtualMachineExtensionLoadContext;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.log.Logger;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.extension.VirtualMachineExtension;
+import org.apache.depot.version.extension.VirtualMachineExtensionLoadContext;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.log.Logger;
 
 /**
  * @author arb_jack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/Annotation.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/Annotation.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/Annotation.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.note;
+package org.apache.depot.version.util.note;
 
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationIterator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationIterator.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationIterator.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.note;
+package org.apache.depot.version.util.note;
 
 import java.util.Iterator;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationScratchpad.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationScratchpad.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/note/AnnotationScratchpad.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.note;
+package org.apache.depot.version.util.note;
 
 import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.version.util.collection.EntityList;
-import org.apache.version.util.debug.DebugUtils;
-import org.apache.version.util.debug.Dumpable;
-import org.apache.version.util.dom.DOMProducer;
-import org.apache.version.util.dom.DOMUtils;
+import org.apache.depot.version.util.collection.EntityList;
+import org.apache.depot.version.util.debug.DebugUtils;
+import org.apache.depot.version.util.debug.Dumpable;
+import org.apache.depot.version.util.dom.DOMProducer;
+import org.apache.depot.version.util.dom.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableError.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableError.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableError.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.throwable;
+package org.apache.depot.version.util.throwable;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-import org.apache.version.util.envsafe.RelativelySafe;
+import org.apache.depot.version.util.envsafe.RelativelySafe;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableException.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.throwable;
+package org.apache.depot.version.util.throwable;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-import org.apache.version.util.envsafe.RelativelySafe;
+import org.apache.depot.version.util.envsafe.RelativelySafe;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableRuntimeException.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableRuntimeException.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableRuntimeException.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.throwable;
+package org.apache.depot.version.util.throwable;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-import org.apache.version.util.envsafe.RelativelySafe;
+import org.apache.depot.version.util.envsafe.RelativelySafe;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableThrowable.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableThrowable.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/util/throwable/PortableThrowable.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.throwable;
+package org.apache.depot.version.util.throwable;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-import org.apache.version.util.envsafe.RelativelySafe;
+import org.apache.depot.version.util.envsafe.RelativelySafe;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/java/core/org/apache/version/version/Version.java
==============================================================================
--- incubator/depot/trunk/version/src/java/core/org/apache/version/version/Version.java	(original)
+++ incubator/depot/trunk/version/src/java/core/org/apache/version/version/Version.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.version;
+package org.apache.depot.version.version;
 
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.data.ReleaseLevel;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/available/VersionAvailableTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/available/VersionAvailableTaskTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/available/VersionAvailableTaskTest.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.available;
+package org.apache.depot.version.ant.available;
 
 import org.apache.tools.ant.BuildFileTest;
 

Modified: incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintCheckTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintCheckTaskTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintCheckTaskTest.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
 import org.apache.tools.ant.BuildFileTest;
 

Modified: incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTaskTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/constraint/ConstraintGeneratorTaskTest.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.constraint;
+package org.apache.depot.version.ant.constraint;
 
 import org.apache.tools.ant.BuildFileTest;
 

Modified: incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/environment/EnvironmentTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/environment/EnvironmentTaskTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/environment/EnvironmentTaskTest.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.environment;
+package org.apache.depot.version.ant.environment;
 
 import org.apache.tools.ant.BuildFileTest;
 

Modified: incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/stamp/VersionGeneratorTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/stamp/VersionGeneratorTaskTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/ant/org/apache/version/ant/stamp/VersionGeneratorTaskTest.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.ant.stamp;
+package org.apache.depot.version.ant.stamp;
 
 import org.apache.tools.ant.BuildFileTest;
 

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/VersionRuntimeTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/VersionRuntimeTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/VersionRuntimeTests.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version;
+package org.apache.depot.version;
 
 import junit.framework.TestCase;
 
-import org.apache.version.context.VersionInformation;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.util.classpath.PathContext;
-import org.apache.version.util.classpath.PathSet;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.util.classpath.PathContext;
+import org.apache.depot.version.util.classpath.PathSet;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/constraint/discovery/text/ConstraintTextTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/constraint/discovery/text/ConstraintTextTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/constraint/discovery/text/ConstraintTextTests.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.constraint.discovery.text;
+package org.apache.depot.version.constraint.discovery.text;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.constraint.IContextConstraint;
-import org.apache.version.constraint.text.ConstraintTextFactory;
-import org.apache.version.context.VersionContextStore;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.constraint.IContextConstraint;
+import org.apache.depot.version.constraint.text.ConstraintTextFactory;
+import org.apache.depot.version.context.VersionContextStore;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/ExtensionRegistryTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/ExtensionRegistryTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/ExtensionRegistryTests.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionRuntime;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.extension.VirtualMachineExtension;
-import org.apache.version.extension.VirtualMachineExtensionInformation;
-import org.apache.version.extension.VirtualMachineExtensionLoadContext;
-import org.apache.version.impl.ApacheVersion;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.extension.VirtualMachineExtension;
+import org.apache.depot.version.extension.VirtualMachineExtensionInformation;
+import org.apache.depot.version.extension.VirtualMachineExtensionLoadContext;
+import org.apache.depot.version.impl.ApacheVersion;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionContextTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionContextTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionContextTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import junit.framework.TestCase;
 

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionInformationTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionInformationTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionInformationTests.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionRuntimeException;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
+import org.apache.depot.version.VersionRuntimeException;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionRegistryTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionRegistryTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/context/VersionRegistryTests.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.context;
+package org.apache.depot.version.context;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionRuntime;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/FilenameLoaderTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/FilenameLoaderTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/FilenameLoaderTests.java	Fri Mar 19 03:39:27 2004
@@ -14,18 +14,18 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.io.File;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.VersionIdentifierType;
-import org.apache.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.VersionIdentifierType;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/LoadTypeTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/LoadTypeTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/LoadTypeTests.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/VersionRuntimeLoadingTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/VersionRuntimeLoadingTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/discovery/loading/VersionRuntimeLoadingTests.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.discovery.loading;
+package org.apache.depot.version.discovery.loading;
 
 import java.util.Iterator;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionRuntime;
-import org.apache.version.context.VersionEnvironment;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.context.VersionEnvironment;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.impl.VersionImplementationConstants;
 
 /**
  * @author ajack
@@ -102,7 +102,7 @@
 				.getStampLoader()
 				.loadFromClassFormat(
 				null,
-				org.apache.version.version.Version.class.getName());
+				org.apache.depot.version.version.Version.class.getName());
 
 		assertNotNull("Resolved version", context);
 		assertEquals(

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/extension/VirtualMachineExtensionInformationTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/extension/VirtualMachineExtensionInformationTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/extension/VirtualMachineExtensionInformationTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.extension;
+package org.apache.depot.version.extension;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionRuntimeException;
-import org.apache.version.discovery.loading.LoadType;
-import org.apache.version.impl.ApacheVersion;
+import org.apache.depot.version.VersionRuntimeException;
+import org.apache.depot.version.discovery.loading.LoadType;
+import org.apache.depot.version.impl.ApacheVersion;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/formatting/ApacheVersionFormatTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/formatting/ApacheVersionFormatTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/formatting/ApacheVersionFormatTest.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.formatting;
+package org.apache.depot.version.formatting;
 
 import junit.framework.TestCase;
 
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.specification.formatting.VersionFormat;
-import org.apache.version.specification.formatting.VersionFormatException;
-import org.apache.version.specification.formatting.format.ApacheVersionFormat;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.specification.formatting.VersionFormat;
+import org.apache.depot.version.specification.formatting.VersionFormatException;
+import org.apache.depot.version.specification.formatting.format.ApacheVersionFormat;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/CompatibilityTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/CompatibilityTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/CompatibilityTests.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ImporterTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ImporterTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ImporterTests.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.util.Date;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.VersionData;
-import org.apache.version.specification.VersionSpecificationFactory;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.VersionData;
+import org.apache.depot.version.specification.VersionSpecificationFactory;
 
 /**
  *

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ResolverTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ResolverTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/ResolverTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionRuntime;
-import org.apache.version.context.Resolver;
-import org.apache.version.context.VersionInformation;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.context.Resolver;
+import org.apache.depot.version.context.VersionInformation;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionIdentifierTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionIdentifierTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionIdentifierTest.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import junit.framework.TestCase;
 
-import org.apache.version.impl.sample.Version1;
-import org.apache.version.version.Version;
+import org.apache.depot.version.impl.sample.Version1;
+import org.apache.depot.version.version.Version;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionImporterTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionImporterTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionImporterTests.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.ReleaseLevel;
-import org.apache.version.specification.VersionSpecification;
-import org.apache.version.specification.VersionSpecificationFactory;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.specification.VersionSpecification;
+import org.apache.depot.version.specification.VersionSpecificationFactory;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/VersionTest.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl;
+package org.apache.depot.version.impl;
 
 import java.util.Iterator;
 import java.util.TreeSet;
 
 import junit.framework.TestCase;
 
-import org.apache.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.ReleaseLevel;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/ReleaseLevelTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/ReleaseLevelTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/ReleaseLevelTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.Iterator;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataComparisonTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataComparisonTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataComparisonTest.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.VersionImporter;
-import org.apache.version.impl.data.util.VersionDataComparison;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.VersionImporter;
+import org.apache.depot.version.impl.data.util.VersionDataComparison;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataConstructorTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataConstructorTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataConstructorTests.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.ApacheVersion;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.ApacheVersion;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataElementSetTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataElementSetTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataElementSetTest.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataMethodTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataMethodTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataMethodTests.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
+import org.apache.depot.version.VersionException;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeIteratorTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeIteratorTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeIteratorTest.java	Fri Mar 19 03:39:27 2004
@@ -14,14 +14,14 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import java.util.Iterator;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.util.VersionDataRangeIterator;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.util.VersionDataRangeIterator;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeTest.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/data/VersionDataRangeTest.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.data;
+package org.apache.depot.version.impl.data;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.impl.data.util.VersionDataRange;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.impl.data.util.VersionDataRange;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/sample/Version1.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/sample/Version1.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/impl/sample/Version1.java	Fri Mar 19 03:39:27 2004
@@ -14,10 +14,10 @@
  *  limitations under the License.
  */
 
-package org.apache.version.impl.sample;
+package org.apache.depot.version.impl.sample;
 
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.data.ReleaseLevel;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/FieldMethodEntityBase1.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/FieldMethodEntityBase1.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/FieldMethodEntityBase1.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
 import junit.framework.TestCase;
 

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/InterfaceBase1.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/InterfaceBase1.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/InterfaceBase1.java	Fri Mar 19 03:39:27 2004
@@ -14,23 +14,23 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
 import java.util.List;
 import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.apache.version.Version;
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.signature.AnnotatedVersionMarkerSignature;
-import org.apache.version.signature.AttributedVersionMarkerSignature;
-import org.apache.version.signature.CompoundVersionSignature;
-import org.apache.version.signature.SimpleVersionSignature;
+import org.apache.depot.version.Version;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.signature.AnnotatedVersionMarkerSignature;
+import org.apache.depot.version.signature.AttributedVersionMarkerSignature;
+import org.apache.depot.version.signature.CompoundVersionSignature;
+import org.apache.depot.version.signature.SimpleVersionSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/PseudoInterfaceTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/PseudoInterfaceTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/PseudoInterfaceTests.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing;
+package org.apache.depot.version.interfacing;
 
 import junit.framework.TestCase;
 
-import org.apache.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.VersionIdentifier;
 
 /**
  */

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/api/APISampleTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/api/APISampleTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/api/APISampleTests.java	Fri Mar 19 03:39:27 2004
@@ -14,16 +14,16 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.api;
+package org.apache.depot.version.interfacing.api;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionMarker;
-import org.apache.version.VersionRuntime;
-import org.apache.version.context.Resolver;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.discovery.loading.StampVersionLoader;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.interfacing.InterfaceBase1;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.context.Resolver;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.discovery.loading.StampVersionLoader;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.interfacing.InterfaceBase1;
 
 /**
  * @author ajack
@@ -48,14 +48,14 @@
 
 	public void testAPI1() throws VersionException {
 		VersionMarker direct =
-			new org.apache.version.version.Version();
+			new org.apache.depot.version.version.Version();
 		VersionLoadContext context = m_loader.load(direct.getClass());
 		compare(direct, context);
 	}
 	
 	public void testAPI2() throws VersionException {
 		VersionMarker direct =
-			new org.apache.version.version.Version();
+			new org.apache.depot.version.version.Version();
 		VersionInformation info = m_resolver.resolve(direct.getClass());
 		compare(direct, info.getLoadContext());
 	}

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundAttributedSampleVersion.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundAttributedSampleVersion.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundAttributedSampleVersion.java	Fri Mar 19 03:39:27 2004
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.complex;
+package org.apache.depot.version.interfacing.complex;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.version.VersionConstants;
-import org.apache.version.signature.AttributedVersionMarkerSignature;
-import org.apache.version.signature.CompoundVersionSignature;
+import org.apache.depot.version.VersionConstants;
+import org.apache.depot.version.signature.AttributedVersionMarkerSignature;
+import org.apache.depot.version.signature.CompoundVersionSignature;
 
 /**
  * @link http://metamorphosis.sourceforge.net/version

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundLocatedSampleVersion.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundLocatedSampleVersion.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundLocatedSampleVersion.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.complex;
+package org.apache.depot.version.interfacing.complex;
 
 import java.util.Date;
 
-import org.apache.version.signature.CompoundVersionSignature;
-import org.apache.version.signature.LocatedVersionMarkerSignature;
+import org.apache.depot.version.signature.CompoundVersionSignature;
+import org.apache.depot.version.signature.LocatedVersionMarkerSignature;
 
 /**
  * @link http://metamorphosis.sourceforge.net/version

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleTests.java	Fri Mar 19 03:39:27 2004
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.complex;
+package org.apache.depot.version.interfacing.complex;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionRuntime;
-import org.apache.version.discovery.loading.StampVersionLoader;
-import org.apache.version.discovery.loading.VersionLoadContext;
-import org.apache.version.interfacing.InterfaceBase1;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.discovery.loading.StampVersionLoader;
+import org.apache.depot.version.discovery.loading.VersionLoadContext;
+import org.apache.depot.version.interfacing.InterfaceBase1;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleVersion.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleVersion.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/complex/CompoundSampleVersion.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.complex;
+package org.apache.depot.version.interfacing.complex;
 
 import java.util.Date;
 
-import org.apache.version.signature.CompoundVersionSignature;
+import org.apache.depot.version.signature.CompoundVersionSignature;
 
 /**
  * @link http://metamorphosis.sourceforge.net/version

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldMethodEntityTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldMethodEntityTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldMethodEntityTests.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.field;
+package org.apache.depot.version.interfacing.field;
 
-import org.apache.version.impl.VersionImplementationConstants;
-import org.apache.version.interfacing.FieldMethodEntityBase1;
-import org.apache.version.signature.FieldVersionSignature;
+import org.apache.depot.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.interfacing.FieldMethodEntityBase1;
+import org.apache.depot.version.signature.FieldVersionSignature;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldSampleTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldSampleTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldSampleTests.java	Fri Mar 19 03:39:27 2004
@@ -14,12 +14,12 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.field;
+package org.apache.depot.version.interfacing.field;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionRuntime;
-import org.apache.version.context.VersionInformation;
-import org.apache.version.interfacing.InterfaceBase1;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.context.VersionInformation;
+import org.apache.depot.version.interfacing.InterfaceBase1;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldVersionSample.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldVersionSample.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/FieldVersionSample.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.field;
+package org.apache.depot.version.interfacing.field;
 
 
 /**

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/QualifiedFieldVersionSample.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/QualifiedFieldVersionSample.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/interfacing/field/QualifiedFieldVersionSample.java	Fri Mar 19 03:39:27 2004
@@ -14,9 +14,9 @@
  *  limitations under the License.
  */
 
-package org.apache.version.interfacing.field;
+package org.apache.depot.version.interfacing.field;
 
-import org.apache.version.impl.VersionImplementationConstants;
+import org.apache.depot.version.impl.VersionImplementationConstants;
 
 /**
  * @author arb_jack@users.sourceforge.net

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/RegistryTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/RegistryTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/RegistryTests.java	Fri Mar 19 03:39:27 2004
@@ -14,11 +14,11 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util;
+package org.apache.depot.version.util;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionError;
+import org.apache.depot.version.VersionError;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathContextTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathContextTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathContextTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import junit.framework.TestCase;
 

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathPartTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathPartTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathPartTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import junit.framework.TestCase;
 

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathSetTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathSetTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathSetTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import java.util.Iterator;
 

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerFilterTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerFilterTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerFilterTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import java.io.File;
 import java.io.InputStream;
@@ -22,12 +22,12 @@
 
 import junit.framework.TestCase;
 
-import org.apache.version.util.classpath.listener.DirectoryListener;
-import org.apache.version.util.classpath.listener.FileContentsListener;
-import org.apache.version.util.classpath.listener.FileListener;
-import org.apache.version.util.classpath.listener.JarListener;
-import org.apache.version.util.classpath.listener.ManifestListener;
-import org.apache.version.util.classpath.listener.NameFilter;
+import org.apache.depot.version.util.classpath.listener.DirectoryListener;
+import org.apache.depot.version.util.classpath.listener.FileContentsListener;
+import org.apache.depot.version.util.classpath.listener.FileListener;
+import org.apache.depot.version.util.classpath.listener.JarListener;
+import org.apache.depot.version.util.classpath.listener.ManifestListener;
+import org.apache.depot.version.util.classpath.listener.NameFilter;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/classpath/PathWalkerTests.java	Fri Mar 19 03:39:27 2004
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.classpath;
+package org.apache.depot.version.util.classpath;
 
 import java.io.File;
 import java.io.InputStream;
@@ -22,12 +22,12 @@
 
 import junit.framework.TestCase;
 
-import org.apache.version.util.classpath.listener.DirectoryListener;
-import org.apache.version.util.classpath.listener.FileContentsListener;
-import org.apache.version.util.classpath.listener.FileListener;
-import org.apache.version.util.classpath.listener.JarListener;
-import org.apache.version.util.classpath.listener.ManifestListener;
-import org.apache.version.util.classpath.listener.NameFilter;
+import org.apache.depot.version.util.classpath.listener.DirectoryListener;
+import org.apache.depot.version.util.classpath.listener.FileContentsListener;
+import org.apache.depot.version.util.classpath.listener.FileListener;
+import org.apache.depot.version.util.classpath.listener.JarListener;
+import org.apache.depot.version.util.classpath.listener.ManifestListener;
+import org.apache.depot.version.util.classpath.listener.NameFilter;
 
 /**
  * @author ajack

Modified: incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/dom/DOMTests.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/dom/DOMTests.java	(original)
+++ incubator/depot/trunk/version/src/test/java/core/org/apache/version/util/dom/DOMTests.java	Fri Mar 19 03:39:27 2004
@@ -14,17 +14,17 @@
  *  limitations under the License.
  */
 
-package org.apache.version.util.dom;
+package org.apache.depot.version.util.dom;
 
 import junit.framework.TestCase;
 
-import org.apache.version.VersionException;
-import org.apache.version.VersionRuntime;
-import org.apache.version.context.VersionEnvironment;
-import org.apache.version.impl.ApacheVersion;
-import org.apache.version.impl.ApacheVersionMarker;
-import org.apache.version.impl.VersionIdentifier;
-import org.apache.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.VersionException;
+import org.apache.depot.version.VersionRuntime;
+import org.apache.depot.version.context.VersionEnvironment;
+import org.apache.depot.version.impl.ApacheVersion;
+import org.apache.depot.version.impl.ApacheVersionMarker;
+import org.apache.depot.version.impl.VersionIdentifier;
+import org.apache.depot.version.impl.data.ReleaseLevel;
 import org.w3c.dom.Document;
 
 /**