Menu
▾
▴
bigdata-commit
|
From: <sgo...@us...> - 2010-08-12 19:35:08
|
Revision: 3442
http://bigdata.svn.sourceforge.net/bigdata/?rev=3442&view=rev
Author: sgossard
Date: 2010-08-12 19:34:54 +0000 (Thu, 12 Aug 2010)
Log Message:
-----------
[merge dev-btm --> maven_scaleout] : svn merge ^/branches/maven_scaleout@HEAD ^/branches/dev-btm@3440 maven_scaleout
Modified Paths:
--------------
branches/maven_scaleout/bigdata/src/java/com/bigdata/bfs/BigdataFileSystem.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/BTree.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/DumpIndexSegment.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/IndexMetadata.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/keys/DefaultKeyBuilderFactory.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/keys/ICUSortKeyGenerator.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/cache/WeakReferenceGlobalLRU.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/counters/AbstractCounterSet.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/counters/AbstractStatisticsCollector.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/io/DirectBufferPool.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/io/WriteCache.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/journal/AbstractLocalTransactionManager.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/journal/DiskOnlyStrategy.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/journal/WriteExecutorService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/mdi/PartitionLocator.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/relation/AbstractResource.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/relation/IMutableResource.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/relation/RelationFusedView.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/relation/locator/DefaultResourceLocator.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/relation/locator/ILocatableResource.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/relation/rule/eval/RuleStats.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/relation/rule/eval/pipeline/DistributedJoinTask.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/AsynchronousOverflowTask.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/BTreeMetadata.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/CompactingMergeTask.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/IndexManager.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/MoveTask.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/OverflowManager.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/ResourceEvents.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/resources/StoreManager.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/AbstractFederation.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/AbstractScaleOutFederation.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/AbstractService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/AbstractTransactionService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/DataService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/DefaultServiceFederationDelegate.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/DistributedTransactionService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/EmbeddedClient.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/EmbeddedFederation.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/Event.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/HostScore.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/IBigdataClient.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/IBigdataFederation.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/IEventReceivingService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/IFederationDelegate.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/ILoadBalancerService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/IServiceLoadHelper.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/ServiceScore.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/ndx/IAsynchronousWriteBufferFactory.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/sparse/GlobalRowStoreHelper.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/sparse/KeyDecoder.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/sparse/TPS.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/striterator/ChunkedConvertingIterator.java
branches/maven_scaleout/bigdata/src/resources/logging/log4j.properties
branches/maven_scaleout/bigdata/src/test/com/bigdata/TestAll.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/btree/AbstractIndexSegmentTestCase.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/btree/TestIndexSegmentMultiBlockIterators.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/btree/keys/TestKeyBuilder.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/concurrent/StressTestNonBlockingLockManagerWithTxDag.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/journal/TestAll.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/journal/TestTransactionService.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/resources/AbstractResourceManagerBootstrapTestCase.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/resources/TestReleaseResources.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/search/TestAll.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestAll.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestDistributedTransactionServiceRestart.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestEventReceiver.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestMove.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestScatterSplit.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/ndx/TestAll.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTask.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/sparse/TestAll.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/BigdataZooDefs.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/ManageLogicalServiceTask.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/MonitorCreatePhysicalServiceLocksTask.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/RestartPersistentServices.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerStartupTask.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/JavaServiceConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/LoadBalancerConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/ManagedServiceConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/ServiceConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniServiceProcessHelper.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/process/ProcessHelper.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/JiniFederation.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/LoadBalancerServer.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/TransactionServer.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/benchmark/ThroughputMaster.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/lookup/AbstractCachingServiceClient.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/lookup/BigdataCachingServiceClient.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/lookup/LoadBalancerClient.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/lookup/ServiceCache.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/master/TaskMaster.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/util/BroadcastSighup.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/util/DumpFederation.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/util/JiniServicesHelper.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/zookeeper/ZooHelper.java
branches/maven_scaleout/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/jini/start/testjini.config
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/service/jini/TestAll.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/service/jini/TestBigdataClient.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/service/jini/master/TestAll.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.java
branches/maven_scaleout/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9.txt
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/internal/DefaultExtensionFactory.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtension.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/internal/IExtensionFactory.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/internal/ILexiconConfiguration.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/internal/IVUtility.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/internal/LexiconConfiguration.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/internal/XSDDecimalIV.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/LexiconRelation.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdWriteProc.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/lexicon/Term2IdWriteTask.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/load/ConcurrentDataLoader.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/load/RDFLoadTaskFactory.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_3_5_6_7_9.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/rules/RDFJoinNexus.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/store/LocalTripleStore.java
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/util/Splitter.config
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/util/Splitter.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/internal/ColorsEnumExtension.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/internal/EpochExtension.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/internal/SampleExtensionFactory.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/rio/AbstractRIOTestCase.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/rio/small.rdf
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/store/AbstractTestCase.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/store/TestAll.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/store/TestScaleOutTripleStoreWithEmbeddedFederation.java
branches/maven_scaleout/bigdata-rdf/src/test/com/bigdata/rdf/store/TestScaleOutTripleStoreWithJiniFederation.java
branches/maven_scaleout/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataEvaluationStrategyImpl2.java
branches/maven_scaleout/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java
branches/maven_scaleout/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
branches/maven_scaleout/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoins.java
branches/maven_scaleout/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java
branches/maven_scaleout/build.properties
branches/maven_scaleout/build.xml
branches/maven_scaleout/src/resources/analysis/queries/benchmark.txt
branches/maven_scaleout/src/resources/bin/config/browser.config
branches/maven_scaleout/src/resources/bin/config/serviceStarter.config
branches/maven_scaleout/src/resources/bin/pstart
branches/maven_scaleout/src/resources/config/README
branches/maven_scaleout/src/resources/config/bigdataCluster.config
branches/maven_scaleout/src/resources/config/bigdataCluster16.config
branches/maven_scaleout/src/resources/config/jini/reggie.config
branches/maven_scaleout/src/resources/config/log4j.properties
branches/maven_scaleout/src/resources/scripts/bigdataup
Added Paths:
-----------
branches/maven_scaleout/bigdata/src/java/com/bigdata/journal/TransactionService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/CallableExecutor.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/EventReceivingService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/LoadBalancer.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/ProcessManager.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/QuorumPeerService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/Service.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/ShardLocator.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/ShardService.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/service/ShutdownAdmin.java
branches/maven_scaleout/bigdata/src/java/com/bigdata/util/Format.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/StressTestConcurrentRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestBasicIndexStuffRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestDistributedTransactionServiceRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestEDSRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestEmbeddedClientRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestMetadataIndexRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestMoveRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestOverflowRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestRangeQueryRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestRestartSafeRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestScatterSplitRemote.java
branches/maven_scaleout/bigdata/src/test/com/bigdata/service/TestSplitJoinRemote.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/attr/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/attr/QuorumPeerAttr.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/attr/ServiceInfo.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/AgentListener.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BaseAgent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BootAgent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BootManager.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BootTool.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/MessageTransport.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/ProcessEventListener.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/ProcessState.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/ProcessStateChangeEvent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/config/boot-processes.xml
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/config/boot-properties.xml
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/BaseProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ConfigReader.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ConfigurationPropertyMap.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ControlCommandListener.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/HybridProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/JavaProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/LauncherMain.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/LogFormatter.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ProcessConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ShutdownEvent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/StdProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/policy/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/policy/launcher.policy
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/starter/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/starter/ServiceStarter.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/starter/SingleNonActivatableServiceStarter.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/DiscoveryTool.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/config/disco.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/config/executor.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/EmbeddedLoadBalancer.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/config/loadbalancer.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/Environment.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/InitializationException.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessConfigXmlHandler.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessInfo.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessManagement.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessStateMachine.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessStateRunner.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/RestartGroup.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/RoleInfo.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/process-definitions.xml
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/process.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/QuorumPeerDataV0.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/QuorumPeerState.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/QuorumPeerStateV0.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/config/quorum.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/config/shard.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/config/transaction.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/BootStateUtil.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/ClassLoaderUtil.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/EntryUtil.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/Util.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/ConfigDeployUtil.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/browser-logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/default-deploy.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/deploy.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/jini-logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/util-logging.properties
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/BootComponentTest.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/SimulatedApp.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_0boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_1boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_1boot_1fail.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_3boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_3boot_1fail.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_3boot_1fail_later.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_boot-processes.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/launcher-logging.properties
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/ConfigReaderUnitTest.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/empty.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/fileToInclude.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/includeFile.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/includeNonexistentFile.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/includeNonexistentRequiredFile.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_boot_arg.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_boot_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_arg.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_javaprop.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_process.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_property.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_process_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_arg.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_javaprop.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_process.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_property.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidProcessTag_missingClass.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidProcessTag_missingTag.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidTag.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/missingBootTag.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/processTagTest.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/propertytest.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/process/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/process/ProcessConfigXmlHandlerTest.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/service/jini/TestBigdataClientRemote.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/service/jini/master/TestMappedRDFDataLoadMasterRemote.java
branches/maven_scaleout/bigdata-perf/bsbm/src/resources/bsbm-data/queries/query9-modified.txt
branches/maven_scaleout/src/resources/bin/boot-tool
branches/maven_scaleout/src/resources/bin/disco-tool
branches/maven_scaleout/src/resources/bin/launcher
branches/maven_scaleout/src/resources/config/bigdataStandalone.config
branches/maven_scaleout/src/resources/config/jini/start-reggie.config
branches/maven_scaleout/src/resources/config/jini/zookeeper.config
branches/maven_scaleout/src/resources/config/servicestarter.policy
branches/maven_scaleout/src/resources/scripts/bigdata.initd
branches/maven_scaleout/src/resources/scripts/dumpFed.sh
branches/maven_scaleout/src/resources/scripts/initd-processes.sh
branches/maven_scaleout/src/resources/scripts/nanoSparqlServer.sh
Removed Paths:
-------------
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/attr/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/attr/QuorumPeerAttr.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/attr/ServiceInfo.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/AgentListener.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BaseAgent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BootAgent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BootManager.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/BootTool.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/MessageTransport.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/ProcessEventListener.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/ProcessState.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/ProcessStateChangeEvent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/config/boot-processes.xml
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/config/boot-properties.xml
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/BaseProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ConfigReader.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ConfigurationPropertyMap.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ControlCommandListener.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/HybridProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/JavaProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/LauncherMain.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/LogFormatter.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ProcessConfiguration.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/ShutdownEvent.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/StdProcessDescriptor.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/launcher/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/policy/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/policy/launcher.policy
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/starter/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/starter/ServiceStarter.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/boot/starter/SingleNonActivatableServiceStarter.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/DiscoveryTool.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/config/disco.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/config/executor.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/executor/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/EmbeddedLoadBalancer.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/config/loadbalancer.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/loadbalancer/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/Environment.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/InitializationException.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessConfigXmlHandler.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessInfo.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessManagement.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessStateMachine.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ProcessStateRunner.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/RestartGroup.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/RoleInfo.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/process-definitions.xml
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/process/config/process.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/QuorumPeerDataV0.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/QuorumPeerState.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/QuorumPeerStateV0.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/quorum/config/quorum.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/shard/config/shard.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/AdminProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/Constants.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/PrivateInterface.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/ServiceImpl.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/ServiceProxy.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/TestAdmin.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/transaction/config/transaction.config
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/Util.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/ConfigDeployUtil.java
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/browser-logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/default-deploy.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/deploy.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/jini-logging.properties
branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config/util-logging.properties
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/BootComponentTest.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/SimulatedApp.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_0boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_1boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_1boot_1fail.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_3boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_3boot_1fail.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_3boot_1fail_later.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/BootComponentTest_boot-processes.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/config/launcher-logging.properties
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/ConfigReaderUnitTest.java
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/empty.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/fileToInclude.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/includeFile.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/includeNonexistentFile.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/includeNonexistentRequiredFile.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_boot_arg.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_boot_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_arg.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_javaprop.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_process.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_javaprop_property.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_process_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_arg.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_boot.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_javaprop.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_process.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidNesting_property_property.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidProcessTag_missingClass.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidProcessTag_missingTag.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/invalidTag.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/missingBootTag.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/processTagTest.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/boot/launcher/config/propertytest.xml
branches/maven_scaleout/bigdata-jini/src/test/com/bigdata/process/ProcessConfigXmlHandlerTest.java
branches/maven_scaleout/src/resources/bin/config/reggie.config
branches/maven_scaleout/src/resources/bin/config/zookeeper.config
branches/maven_scaleout/src/resources/bin/disco-tool
branches/maven_scaleout/src/resources/config/browser-logging.properties
branches/maven_scaleout/src/resources/config/jini/fiddler.config
branches/maven_scaleout/src/resources/config/jini/mahalo.config
branches/maven_scaleout/src/resources/config/jini/mercury.config
branches/maven_scaleout/src/resources/config/jini/norm.config
branches/maven_scaleout/src/resources/config/jini/outrigger.config
Property Changed:
----------------
branches/maven_scaleout/
branches/maven_scaleout/bigdata-perf/
branches/maven_scaleout/bigdata-perf/btc/
branches/maven_scaleout/bigdata-perf/btc/src/
branches/maven_scaleout/bigdata-perf/btc/src/resources/
branches/maven_scaleout/bigdata-perf/btc/src/resources/logging/
branches/maven_scaleout/bigdata-perf/lubm/lib/
branches/maven_scaleout/bigdata-perf/lubm/src/resources/
branches/maven_scaleout/bigdata-perf/lubm/src/resources/answers (U1)/
branches/maven_scaleout/bigdata-perf/lubm/src/resources/config/
branches/maven_scaleout/bigdata-perf/lubm/src/resources/logging/
branches/maven_scaleout/bigdata-perf/lubm/src/resources/scripts/
branches/maven_scaleout/bigdata-perf/uniprot/
branches/maven_scaleout/bigdata-perf/uniprot/src/
branches/maven_scaleout/bigdata-perf/uniprot/src/resources/
branches/maven_scaleout/bigdata-perf/uniprot/src/resources/logging/
branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/util/
branches/maven_scaleout/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
branches/maven_scaleout/dsi-utils/LEGAL/
branches/maven_scaleout/dsi-utils/lib/
branches/maven_scaleout/dsi-utils/src/
branches/maven_scaleout/dsi-utils/src/java/
branches/maven_scaleout/dsi-utils/src/java/it/
branches/maven_scaleout/dsi-utils/src/java/it/unimi/
branches/maven_scaleout/dsi-utils/src/java/it/unimi/dsi/
branches/maven_scaleout/dsi-utils/src/java/it/unimi/dsi/compression/
branches/maven_scaleout/dsi-utils/src/java/it/unimi/dsi/io/
branches/maven_scaleout/dsi-utils/src/java/it/unimi/dsi/util/
branches/maven_scaleout/dsi-utils/src/test/
branches/maven_scaleout/dsi-utils/src/test/it/
branches/maven_scaleout/dsi-utils/src/test/it/unimi/
branches/maven_scaleout/dsi-utils/src/test/it/unimi/dsi/
branches/maven_scaleout/dsi-utils/src/test/it/unimi/dsi/io/
branches/maven_scaleout/dsi-utils/src/test/it/unimi/dsi/util/
branches/maven_scaleout/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/osgi/
branches/maven_scaleout/src/resources/config/
Property changes on: branches/maven_scaleout
___________________________________________________________________
Modified: svn:ignore
- ant-build
src
bin
bigdata*.jar
ant-release
standalone
test*
countersfinal.xml
events.jnl
.settings
*.jnl
TestInsertRate.out
SYSTAP-BBT-result.txt
U10load+query
*.hprof
com.bigdata.cache.TestHardReferenceQueueWithBatchingUpdates.exp.csv
commit-log.txt
eventLog
dist
bigdata-test
com.bigdata.rdf.stress.LoadClosureAndQueryTest.*.csv
+ ant-build
src
bin
bigdata*.jar
ant-release
standalone
test*
countersfinal.xml
events.jnl
.settings
*.jnl
TestInsertRate.out
SYSTAP-BBT-result.txt
U10load+query
*.hprof
com.bigdata.cache.TestHardReferenceQueueWithBatchingUpdates.exp.csv
commit-log.txt
eventLog
dist
bigdata-test
com.bigdata.rdf.stress.LoadClosureAndQueryTest.*.csv
DIST.*.tgz
REL.*.tgz
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
+ /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440
/branches/fko:3150-3194
/trunk:3379-3430
Modified: branches/maven_scaleout/bigdata/src/java/com/bigdata/bfs/BigdataFileSystem.java
===================================================================
--- branches/maven_scaleout/bigdata/src/java/com/bigdata/bfs/BigdataFileSystem.java 2010-08-12 16:49:25 UTC (rev 3441)
+++ branches/maven_scaleout/bigdata/src/java/com/bigdata/bfs/BigdataFileSystem.java 2010-08-12 19:34:54 UTC (rev 3442)
@@ -420,7 +420,7 @@
}
}
-
+
/**
* Note: A commit is required in order for a read-committed view to have
* access to the registered indices. When running against an
Modified: branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
===================================================================
--- branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/AbstractBTree.java 2010-08-12 16:49:25 UTC (rev 3441)
+++ branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/AbstractBTree.java 2010-08-12 19:34:54 UTC (rev 3442)
@@ -2840,7 +2840,8 @@
* might also want to limit the maximum size of the reads.
*/
- final DirectBufferPool pool = DirectBufferPool.INSTANCE_10M;
+// final DirectBufferPool pool = DirectBufferPool.INSTANCE_10M;
+ final DirectBufferPool pool = DirectBufferPool.INSTANCE;
if (true
&& ((flags & REVERSE) == 0)
Modified: branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/BTree.java
===================================================================
--- branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/BTree.java 2010-08-12 16:49:25 UTC (rev 3441)
+++ branches/maven_scaleout/bigdata/src/java/com/bigdata/btree/BTree.java 2010-08-12 19:34:54 UTC (rev 3442)
@@ -644,7 +644,18 @@
this.lastCommitTime = lastCommitTime;
}
- private long lastCommitTime = 0L;// Until the first commit.
+
+ /**
+ * The lastCommitTime of the {@link Checkpoint} record from which the
+ * {@link BTree} was loaded.
+ * <p>
+ * Note: Made volatile on 8/2/2010 since it is not otherwise obvious what
+ * would guarantee visibility of this field, through I do seem to remember
+ * that visibility might be guaranteed by how the BTree class is discovered
+ * and returned to the class. Still, it does no harm to make this a volatile
+ * read.
+ */
+ volatile private long lastCommitTime = 0L;// Until the first commit.
/**
* Return the {@link IDirtyListener}.
@@ -1525,45 +1536,63 @@
}
- /**
- * Load an instance of a {@link BTree} or derived class from the store. The
- * {@link BTree} or derived class MUST declare a constructor with the
- * following signature: <code>
+ /**
+ * Load an instance of a {@link BTree} or derived class from the store. The
+ * {@link BTree} or derived class MUST declare a constructor with the
+ * following signature: <code>
*
* <i>className</i>(IRawStore store, Checkpoint checkpoint, BTreeMetadata metadata, boolean readOnly)
*
* </code>
- *
- * @param store
- * The store.
- * @param addrCheckpoint
- * The address of a {@link Checkpoint} record for the index.
- * @param readOnly
- * When <code>true</code> the {@link BTree} will be marked as
- * read-only. Marking has some advantages relating to the locking
- * scheme used by {@link Node#getChild(int)} since the root node
- * is known to be read-only at the time that it is allocated as
- * per-child locking is therefore in place for all nodes in the
- * read-only {@link BTree}. It also results in much higher
- * concurrency for {@link AbstractBTree#touch(AbstractNode)}.
- *
- * @return The {@link BTree} or derived class loaded from that
- * {@link Checkpoint} record.
- */
+ *
+ * @param store
+ * The store.
+ * @param addrCheckpoint
+ * The address of a {@link Checkpoint} record for the index.
+ * @param readOnly
+ * When <code>true</code> the {@link BTree} will be marked as
+ * read-only. Marking has some advantages relating to the locking
+ * scheme used by {@link Node#getChild(int)} since the root node
+ * is known to be read-only at the time that it is allocated as
+ * per-child locking is therefore in place for all nodes in the
+ * read-only {@link BTree}. It also results in much higher
+ * concurrency for {@link AbstractBTree#touch(AbstractNode)}.
+ *
+ * @return The {@link BTree} or derived class loaded from that
+ * {@link Checkpoint} record.
+ *
+ * @throws IllegalArgumentException
+ * if store is <code>null</code>.
+ */
@SuppressWarnings("unchecked")
public static BTree load(final IRawStore store, final long addrCheckpoint,
final boolean readOnly) {
+ if (store == null)
+ throw new IllegalArgumentException();
+
/*
* Read checkpoint record from store.
*/
- final Checkpoint checkpoint = Checkpoint.load(store, addrCheckpoint);
+ final ...
[truncated message content] |
|
From: <sgo...@us...> - 2010-08-25 22:26:51
|
Revision: 3461
http://bigdata.svn.sourceforge.net/bigdata/?rev=3461&view=rev
Author: sgossard
Date: 2010-08-25 22:26:34 +0000 (Wed, 25 Aug 2010)
Log Message:
-----------
[maven_scaleout] : Initial pass at converting branch from ant to maven. Majority of the work involved colapsing intertwined source folders and fixing tests that looked for data in the source tree.
Added Paths:
-----------
branches/maven_scaleout/LEGAL/
branches/maven_scaleout/LEGAL/iris-license.txt
branches/maven_scaleout/LEGAL/jgrapht-license.txt
branches/maven_scaleout/LEGAL/jini-license.txt
branches/maven_scaleout/LEGAL/nxparser-license.txt
branches/maven_scaleout/LEGAL/sesame2.x-license.txt
branches/maven_scaleout/LEGAL/slf4j-license.txt
branches/maven_scaleout/pom.xml
branches/maven_scaleout/src/main/
branches/maven_scaleout/src/main/assembly/
branches/maven_scaleout/src/main/assembly/deploy.xml
branches/maven_scaleout/src/main/deploy/
branches/maven_scaleout/src/main/deploy/README
branches/maven_scaleout/src/main/deploy/bin/
branches/maven_scaleout/src/main/deploy/bin/boot-tool
branches/maven_scaleout/src/main/deploy/bin/config/
branches/maven_scaleout/src/main/deploy/bin/config/browser.config
branches/maven_scaleout/src/main/deploy/bin/config/disco.config
branches/maven_scaleout/src/main/deploy/bin/config/serviceStarter.config
branches/maven_scaleout/src/main/deploy/bin/disco-tool
branches/maven_scaleout/src/main/deploy/bin/initd-processes.sh
branches/maven_scaleout/src/main/deploy/bin/launcher
branches/maven_scaleout/src/main/deploy/bin/pstart
branches/maven_scaleout/src/main/deploy/config/
branches/maven_scaleout/src/main/deploy/etc/
branches/maven_scaleout/src/main/deploy/etc/bigdata.initd
branches/maven_scaleout/src/main/deploy/install.properties
branches/maven_scaleout/src/main/deploy/install.xml
branches/maven_scaleout/src/main/deploy/legacy/
branches/maven_scaleout/src/main/deploy/legacy/HOWTO/
branches/maven_scaleout/src/main/deploy/legacy/analysis/
branches/maven_scaleout/src/main/deploy/legacy/analysis/queries/
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/flot-0.5.zip
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/logging/
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/logging/log4j-perf-tests.properties
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/logging/logging.properties
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/xml/
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/xml/counterset-example1.xml
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/xml/counterset.dtd
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/xml/counterset.html
branches/maven_scaleout/src/main/deploy/legacy/bigdata-resources/xml/counterset2html.xslt
branches/maven_scaleout/src/main/deploy/legacy/bin/
branches/maven_scaleout/src/main/deploy/legacy/bin/config/
branches/maven_scaleout/src/main/deploy/legacy/config/
branches/maven_scaleout/src/main/deploy/legacy/config/README
branches/maven_scaleout/src/main/deploy/legacy/config/jini/
branches/maven_scaleout/src/main/deploy/legacy/config/jini/README
branches/maven_scaleout/src/main/deploy/legacy/config/jini/browser.config
branches/maven_scaleout/src/main/deploy/legacy/config/jini/startAll.config
branches/maven_scaleout/src/main/deploy/legacy/config/jini/zookeeper.config
branches/maven_scaleout/src/main/deploy/legacy/config/logging.properties
branches/maven_scaleout/src/main/deploy/legacy/config/ntpd/
branches/maven_scaleout/src/main/deploy/legacy/config/ntpd/ntp-client.conf
branches/maven_scaleout/src/main/deploy/legacy/config/ntpd/ntp.conf
branches/maven_scaleout/src/main/deploy/legacy/config/standalone/
branches/maven_scaleout/src/main/deploy/legacy/config/standalone/README
branches/maven_scaleout/src/main/deploy/legacy/config/standalone/bigdataStandalone.config
branches/maven_scaleout/src/main/deploy/legacy/config/standalone/log4j.properties
branches/maven_scaleout/src/main/deploy/legacy/config/zookeeper-logging.properties
branches/maven_scaleout/src/main/deploy/legacy/etc/
branches/maven_scaleout/src/main/deploy/legacy/etc/README
branches/maven_scaleout/src/main/deploy/legacy/etc/ntp-client.conf
branches/maven_scaleout/src/main/deploy/legacy/etc/ntp.conf
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/config/
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/remoting/
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/remoting/bigdata.properties
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/remoting/build.properties
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/remoting/build.xml
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/remoting/web.xml
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/sesame-server/
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/sesame-server/META-INF/
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/sesame-server/META-INF/services/
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/sesame-server/META-INF/services/org.openrdf.sail.config.SailFactory
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/sesame-server/templates/
branches/maven_scaleout/src/main/deploy/legacy/sail-resources/sesame-server/templates/bigdata.ttl
branches/maven_scaleout/src/main/deploy/legacy/scripts/
branches/maven_scaleout/src/main/deploy/legacy/scripts/POST-INSTALL
branches/maven_scaleout/src/main/deploy/legacy/scripts/RDFDataLoadMaster.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/README
branches/maven_scaleout/src/main/deploy/legacy/scripts/archiveRun.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/bigdata
branches/maven_scaleout/src/main/deploy/legacy/scripts/bigdatadown
branches/maven_scaleout/src/main/deploy/legacy/scripts/bigdataenv
branches/maven_scaleout/src/main/deploy/legacy/scripts/bigdataprecond
branches/maven_scaleout/src/main/deploy/legacy/scripts/bigdatasetup
branches/maven_scaleout/src/main/deploy/legacy/scripts/bigdataup
branches/maven_scaleout/src/main/deploy/legacy/scripts/broadcast_sighup
branches/maven_scaleout/src/main/deploy/legacy/scripts/counters.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/crontab.system
branches/maven_scaleout/src/main/deploy/legacy/scripts/crontab.user
branches/maven_scaleout/src/main/deploy/legacy/scripts/dumpFed.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/dumpZoo.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/extractCounters.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/jiniStart.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/listServices.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/nanoSparqlServer.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/runLog4jServer.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/setProperties.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/testStatisticsCollector.sh
branches/maven_scaleout/src/main/deploy/legacy/scripts/throughputMaster.sh
branches/maven_scaleout/src/main/deploy/lib/
branches/maven_scaleout/src/main/deploy/lib-dl/
branches/maven_scaleout/src/main/deploy/lib-ext/
branches/maven_scaleout/src/main/deploy/var/
branches/maven_scaleout/src/main/deploy/var/config/
branches/maven_scaleout/src/main/deploy/var/config/deploy/
branches/maven_scaleout/src/main/deploy/var/config/deploy/default-deploy.properties
branches/maven_scaleout/src/main/deploy/var/config/deploy/example-deploy.properties
branches/maven_scaleout/src/main/deploy/var/config/jini/
branches/maven_scaleout/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/src/main/deploy/var/config/jini/bigdataCluster16.config
branches/maven_scaleout/src/main/deploy/var/config/jini/bigdataStandalone.config
branches/maven_scaleout/src/main/deploy/var/config/jini/boot/
branches/maven_scaleout/src/main/deploy/var/config/jini/boot/boot-processes.xml
branches/maven_scaleout/src/main/deploy/var/config/jini/boot/boot-properties.xml
branches/maven_scaleout/src/main/deploy/var/config/jini/boot/process-definitions.xml
branches/maven_scaleout/src/main/deploy/var/config/jini/executor.config
branches/maven_scaleout/src/main/deploy/var/config/jini/loadbalancer.config
branches/maven_scaleout/src/main/deploy/var/config/jini/lookup.config
branches/maven_scaleout/src/main/deploy/var/config/jini/process.config
branches/maven_scaleout/src/main/deploy/var/config/jini/quorum.config
branches/maven_scaleout/src/main/deploy/var/config/jini/reggie.config
branches/maven_scaleout/src/main/deploy/var/config/jini/shard.config
branches/maven_scaleout/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/src/main/deploy/var/config/jini/start-reggie.config
branches/maven_scaleout/src/main/deploy/var/config/jini/transaction.config
branches/maven_scaleout/src/main/deploy/var/config/logging/
branches/maven_scaleout/src/main/deploy/var/config/logging/browser-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/disco-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/executor-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/jini-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/loadbalancer-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/log4j.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/log4jServer.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/log4jStandalone.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/process-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/quorum-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/reggie-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/shard-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/logging/util-logging.properties
branches/maven_scaleout/src/main/deploy/var/config/policy/
branches/maven_scaleout/src/main/deploy/var/config/policy/launcher.policy
branches/maven_scaleout/src/main/deploy/var/config/policy/policy.all
branches/maven_scaleout/src/main/deploy/var/config/policy/service.policy
branches/maven_scaleout/src/main/deploy/var/config/policy/servicestarter.policy
branches/maven_scaleout/src/main/deploy/var/log/
branches/maven_scaleout/src/main/docs/
branches/maven_scaleout/src/main/docs/analysis/
branches/maven_scaleout/src/main/docs/analysis/RDFDataLoader.xls
branches/maven_scaleout/src/main/docs/analysis/README
branches/maven_scaleout/src/main/docs/analysis/bigdataServices.xls
branches/maven_scaleout/src/main/docs/analysis/clientIndices.xls
branches/maven_scaleout/src/main/docs/analysis/mappedJob.xls
branches/maven_scaleout/src/main/docs/analysis/queries/
branches/maven_scaleout/src/main/docs/analysis/queries/README.txt
branches/maven_scaleout/src/main/docs/analysis/queries/benchmark.txt
branches/maven_scaleout/src/main/docs/analysis/queries/rdfDataLoad.txt
branches/maven_scaleout/src/main/docs/architecture/
branches/maven_scaleout/src/main/docs/architecture/MVCC.txt
branches/maven_scaleout/src/main/docs/architecture/index performance tradeoffs.xls
branches/maven_scaleout/src/main/docs/btree-record-refactor.xls
branches/maven_scaleout/src/main/docs/com/
branches/maven_scaleout/src/main/docs/com/bigdata/
branches/maven_scaleout/src/main/docs/com/bigdata/gom/
branches/maven_scaleout/src/main/docs/com/bigdata/gom/clusterIndices.txt
branches/maven_scaleout/src/main/docs/releases/
branches/maven_scaleout/src/main/docs/xdocs/
branches/maven_scaleout/src/main/java/
branches/maven_scaleout/src/main/java/com/
branches/maven_scaleout/src/main/java/com/bigdata/
branches/maven_scaleout/src/main/java/com/bigdata/DataFinder.java
branches/maven_scaleout/src/main/java/com/bigdata/attr/
branches/maven_scaleout/src/main/java/com/bigdata/bfs/BigdataFileSystem.java
branches/maven_scaleout/src/main/java/com/bigdata/boot/
branches/maven_scaleout/src/main/java/com/bigdata/boot/launcher/JavaProcessDescriptor.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/AbstractBTree.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/BTree.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/DumpIndexSegment.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/IndexMetadata.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/keys/DefaultKeyBuilderFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/keys/ICUSortKeyGenerator.java
branches/maven_scaleout/src/main/java/com/bigdata/cache/WeakReferenceGlobalLRU.java
branches/maven_scaleout/src/main/java/com/bigdata/counters/AbstractCounterSet.java
branches/maven_scaleout/src/main/java/com/bigdata/counters/AbstractStatisticsCollector.java
branches/maven_scaleout/src/main/java/com/bigdata/disco/
branches/maven_scaleout/src/main/java/com/bigdata/executor/
branches/maven_scaleout/src/main/java/com/bigdata/io/DirectBufferPool.java
branches/maven_scaleout/src/main/java/com/bigdata/io/WriteCache.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/AbstractServicesManagerService.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ManageLogicalServiceTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/MonitorCreatePhysicalServiceLocksTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/RestartPersistentServices.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ServicesManagerServer.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ServicesManagerStartupTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/JavaServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/LoadBalancerConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ManagedServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/JiniServiceProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/ProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/AbstractJournal.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/AbstractLocalTransactionManager.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/DiskOnlyStrategy.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/TransactionService.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/WriteExecutorService.java
branches/maven_scaleout/src/main/java/com/bigdata/loadbalancer/
branches/maven_scaleout/src/main/java/com/bigdata/loadbalancer/ServiceImpl.java
branches/maven_scaleout/src/main/java/com/bigdata/mdi/PartitionLocator.java
branches/maven_scaleout/src/main/java/com/bigdata/metadata/
branches/maven_scaleout/src/main/java/com/bigdata/process/
branches/maven_scaleout/src/main/java/com/bigdata/quorum/
branches/maven_scaleout/src/main/java/com/bigdata/rdf/
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/DefaultExtensionFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/IExtension.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/IExtensionFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/ILexiconConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/IVUtility.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/LexiconConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/XSDDecimalIV.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/lexicon/LexiconRelation.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/lexicon/Term2IdWriteProc.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/lexicon/Term2IdWriteTask.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/load/ConcurrentDataLoader.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/load/RDFLoadTaskFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_3_5_6_7_9.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/rules/RDFJoinNexus.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/sail/
branches/maven_scaleout/src/main/java/com/bigdata/rdf/store/AbstractTripleStore.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/store/LocalTripleStore.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/util/
branches/maven_scaleout/src/main/java/com/bigdata/relation/AbstractResource.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/IMutableResource.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/RelationFusedView.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/locator/DefaultResourceLocator.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/locator/ILocatableResource.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/rule/eval/RuleStats.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/rule/eval/pipeline/DistributedJoinTask.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/AsynchronousOverflowTask.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/BTreeMetadata.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/CompactingMergeTask.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/IndexManager.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/MoveTask.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/OverflowManager.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/ResourceEvents.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/StoreManager.java
branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractEmbeddedLoadBalancerService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractScaleOutFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractTransactionService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/CallableExecutor.java
branches/maven_scaleout/src/main/java/com/bigdata/service/DataService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultServiceFederationDelegate.java
branches/maven_scaleout/src/main/java/com/bigdata/service/DistributedTransactionService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/EmbeddedClient.java
branches/maven_scaleout/src/main/java/com/bigdata/service/EmbeddedFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/Event.java
branches/maven_scaleout/src/main/java/com/bigdata/service/EventReceivingService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/HostScore.java
branches/maven_scaleout/src/main/java/com/bigdata/service/IBigdataClient.java
branches/maven_scaleout/src/main/java/com/bigdata/service/IBigdataFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/IEventReceivingService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/IFederationDelegate.java
branches/maven_scaleout/src/main/java/com/bigdata/service/ILoadBalancerService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/IServiceLoadHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/service/LoadBalancer.java
branches/maven_scaleout/src/main/java/com/bigdata/service/ProcessManager.java
branches/maven_scaleout/src/main/java/com/bigdata/service/QuorumPeerService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/Service.java
branches/maven_scaleout/src/main/java/com/bigdata/service/ServiceScore.java
branches/maven_scaleout/src/main/java/com/bigdata/service/ShardLocator.java
branches/maven_scaleout/src/main/java/com/bigdata/service/ShardService.java
branches/maven_scaleout/src/main/java/com/bigdata/service/ShutdownAdmin.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/AbstractServer.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/JiniFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/LoadBalancerServer.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/TransactionServer.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/benchmark/ThroughputMaster.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/lookup/AbstractCachingServiceClient.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/lookup/BigdataCachingServiceClient.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/lookup/LoadBalancerClient.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/lookup/ServiceCache.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/master/TaskMaster.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/BroadcastSighup.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/DumpFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/JiniServicesHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/LookupStarter.java
branches/maven_scaleout/src/main/java/com/bigdata/service/ndx/IAsynchronousWriteBufferFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/shard/
branches/maven_scaleout/src/main/java/com/bigdata/sparse/GlobalRowStoreHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/sparse/KeyDecoder.java
branches/maven_scaleout/src/main/java/com/bigdata/sparse/TPS.java
branches/maven_scaleout/src/main/java/com/bigdata/striterator/ChunkedConvertingIterator.java
branches/maven_scaleout/src/main/java/com/bigdata/transaction/
branches/maven_scaleout/src/main/java/com/bigdata/util/BootStateUtil.java
branches/maven_scaleout/src/main/java/com/bigdata/util/ClassLoaderUtil.java
branches/maven_scaleout/src/main/java/com/bigdata/util/EntryUtil.java
branches/maven_scaleout/src/main/java/com/bigdata/util/Format.java
branches/maven_scaleout/src/main/java/com/bigdata/util/Util.java
branches/maven_scaleout/src/main/java/com/bigdata/util/config/ConfigDeployUtil.java
branches/maven_scaleout/src/main/java/com/bigdata/util/config/LogUtil.java
branches/maven_scaleout/src/main/java/com/bigdata/zookeeper/
branches/maven_scaleout/src/main/java/com/bigdata/zookeeper/ZooHelper.java
branches/maven_scaleout/src/main/java/org/
branches/maven_scaleout/src/main/java/org/apache/
branches/maven_scaleout/src/main/java/org/apache/system/
branches/maven_scaleout/src/main/java/org/openrdf/
branches/maven_scaleout/src/main/java/org/openrdf/rio/
branches/maven_scaleout/src/main/java/org/openrdf/rio/rdfxml/
branches/maven_scaleout/src/main/native/
branches/maven_scaleout/src/main/native/com/
branches/maven_scaleout/src/main/native/com/bigdata/
branches/maven_scaleout/src/main/native/com/bigdata/btree/
branches/maven_scaleout/src/main/native/com/bigdata/btree/BytesUtil.c
branches/maven_scaleout/src/main/native/com/bigdata/btree/compile.sh
branches/maven_scaleout/src/main/resources/
branches/maven_scaleout/src/main/resources/META-INF/
branches/maven_scaleout/src/main/resources/com/
branches/maven_scaleout/src/main/resources/com/bigdata/
branches/maven_scaleout/src/main/resources/com/bigdata/counters/
branches/maven_scaleout/src/main/resources/com/bigdata/counters/httpd/
branches/maven_scaleout/src/main/resources/com/bigdata/counters/httpd/excanvas.pack.js
branches/maven_scaleout/src/main/resources/com/bigdata/counters/httpd/jquery.flot.js
branches/maven_scaleout/src/main/resources/com/bigdata/counters/httpd/jquery.js
branches/maven_scaleout/src/main/resources/com/bigdata/counters/render/
branches/maven_scaleout/src/main/resources/com/bigdata/counters/render/flot-end.txt
branches/maven_scaleout/src/main/resources/com/bigdata/counters/render/flot-start.txt
branches/maven_scaleout/src/main/resources/com/bigdata/rdf/
branches/maven_scaleout/src/main/resources/com/bigdata/rdf/util/
branches/maven_scaleout/src/main/resources/com/bigdata/rdf/util/Splitter.config
branches/maven_scaleout/src/samples/
branches/maven_scaleout/src/samples-sail/
branches/maven_scaleout/src/test/
branches/maven_scaleout/src/test/deploy/
branches/maven_scaleout/src/test/deploy/testing/
branches/maven_scaleout/src/test/deploy/testing/conf/
branches/maven_scaleout/src/test/deploy/testing/conf/README.txt
branches/maven_scaleout/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/src/test/deploy/testing/conf/policy.all
branches/maven_scaleout/src/test/deploy/testing/conf/standalone/
branches/maven_scaleout/src/test/deploy/testing/data/
branches/maven_scaleout/src/test/deploy/testing/data/com/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_0boot.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_1boot.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_1boot_1fail.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_3boot.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_3boot_1fail.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_3boot_1fail_later.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_boot-processes.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/config/launcher-logging.properties
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/empty.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/fileToInclude.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/includeFile.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/includeNonexistentFile.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/includeNonexistentRequiredFile.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_boot_arg.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_boot_boot.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_javaprop_arg.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_javaprop_boot.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_javaprop_javaprop.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_javaprop_process.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_javaprop_property.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_process_boot.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_property_arg.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_property_boot.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_property_javaprop.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_property_process.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidNesting_property_property.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidProcessTag_missingClass.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidProcessTag_missingTag.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/invalidTag.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/missingBootTag.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/processTagTest.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/boot/launcher/config/propertytest.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/btree/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/btree/raba/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/btree/raba/codec/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/btree/raba/codec/AbstractRabaCoderTestCase.java
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/cache/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/cache/StressTestGlobalLRU.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/cache/TestHardReferenceQueueWithBatchingEvictions.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/start/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/start/config/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/start/testReggie.config
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/start/testStartJini.config
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/jini/start/testjini.config
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/metrics/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/metrics/q1155248500387_0001.apq
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/metrics/sample data.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/metrics/small.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rio/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rio/broken.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rio/sample data.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rio/small.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/LoadClosureAndQueryExperiment-LUBM-U1.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/sample data.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/small owlSameAs.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/small.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/testLubm.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/testOwlSameAs.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/rules/testSimpleLubm.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/sail/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/rdf/sail/provenance01.rdf
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/service/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/service/jini/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/service/jini/PerformanceTest.xml
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/service/jini/master/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/service/testSendFile.seg
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/zookeeper/
branches/maven_scaleout/src/test/deploy/testing/data/com/bigdata/zookeeper/testzoo.config
branches/maven_scaleout/src/test/deploy/testing/data/datafinder.txt
branches/maven_scaleout/src/test/deploy/testing/lib-test/
branches/maven_scaleout/src/test/deploy/testing/test.xml
branches/maven_scaleout/src/test/java/
branches/maven_scaleout/src/test/java/com/
branches/maven_scaleout/src/test/java/com/bigdata/
branches/maven_scaleout/src/test/java/com/bigdata/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/TestDataFinder.java
branches/maven_scaleout/src/test/java/com/bigdata/boot/
branches/maven_scaleout/src/test/java/com/bigdata/boot/BootComponentTest.java
branches/maven_scaleout/src/test/java/com/bigdata/boot/launcher/ConfigReaderUnitTest.java
branches/maven_scaleout/src/test/java/com/bigdata/btree/AbstractIndexSegmentTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/btree/TestIndexSegmentMultiBlockIterators.java
branches/maven_scaleout/src/test/java/com/bigdata/btree/data/AbstractNodeOrLeafDataRecordTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/btree/keys/TestKeyBuilder.java
branches/maven_scaleout/src/test/java/com/bigdata/btree/raba/codec/AbstractRabaCoderTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/cache/StressTestGlobalLRU.java
branches/maven_scaleout/src/test/java/com/bigdata/cache/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/concurrent/StressTestNonBlockingLockManagerWithTxDag.java
branches/maven_scaleout/src/test/java/com/bigdata/jini/
branches/maven_scaleout/src/test/java/com/bigdata/jini/start/AbstractFedZooTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/jini/start/TestJiniCoreServicesProcessHelper.java
branches/maven_scaleout/src/test/java/com/bigdata/jini/start/config/TestServiceConfiguration.java
branches/maven_scaleout/src/test/java/com/bigdata/journal/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/journal/TestTransactionService.java
branches/maven_scaleout/src/test/java/com/bigdata/process/
branches/maven_scaleout/src/test/java/com/bigdata/process/ProcessConfigXmlHandlerTest.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/
branches/maven_scaleout/src/test/java/com/bigdata/rdf/internal/ColorsEnumExtension.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/internal/EpochExtension.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/internal/SampleExtensionFactory.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/magic/TestMagicStore.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/metrics/
branches/maven_scaleout/src/test/java/com/bigdata/rdf/metrics/AbstractMetricsTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/metrics/MetricsQueryParser.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/metrics/TaskATest.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/metrics/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/metrics/TestMetrics.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/metrics/TestQueryReader.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rio/AbstractRIOTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rio/EDSAsyncLoader.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/AbstractInferenceEngineTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/AbstractRuleTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestCompareFullAndFastClosure.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestDistinct.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestDistinctTermScan.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestJustifications.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestMappedProgram.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestMatch.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestModelsEqual.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestOptionals.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestOrderBy.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleExpansion.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentClass.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentProperty.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleOwlHasValue.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleOwlInverseOf.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSameAs.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleOwlTransitiveProperty.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleRdf01.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs03.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs04.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs07.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs10.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs11.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestSlice.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestTMUtility.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/rules/TestUnion.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/
branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoins.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/TestProvenanceQuery.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/TestQuery.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/store/AbstractTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/store/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/store/TestScaleOutTripleStoreWithEmbeddedFederation.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/store/TestScaleOutTripleStoreWithJiniFederation.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/stress/
branches/maven_scaleout/src/test/java/com/bigdata/resources/AbstractResourceManagerBootstrapTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/resources/TestReleaseResources.java
branches/maven_scaleout/src/test/java/com/bigdata/search/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/service/StressTestConcurrent.java
branches/maven_scaleout/src/test/java/com/bigdata/service/StressTestConcurrentRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestBasicIndexStuffRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestDistributedTransactionServiceRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestDistributedTransactionServiceRestart.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestEDSRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestEmbeddedClientRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestEventReceiver.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestMetadataIndexRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestMove.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestMoveRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestOverflowRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestRangeQueryRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestResourceService.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestRestartSafeRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestScatterSplit.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestScatterSplitRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestSplitJoinRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/jini/
branches/maven_scaleout/src/test/java/com/bigdata/service/jini/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/service/jini/TestBigdataClient.java
branches/maven_scaleout/src/test/java/com/bigdata/service/jini/TestBigdataClientRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/jini/master/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.java
branches/maven_scaleout/src/test/java/com/bigdata/service/jini/master/TestMappedRDFDataLoadMasterRemote.java
branches/maven_scaleout/src/test/java/com/bigdata/service/mapred/
branches/maven_scaleout/src/test/java/com/bigdata/service/ndx/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/service/ndx/pipeline/TestFileSystemScanner.java
branches/maven_scaleout/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTask.java
branches/maven_scaleout/src/test/java/com/bigdata/sparse/TestAll.java
branches/maven_scaleout/src/test/java/com/bigdata/zookeeper/
branches/maven_scaleout/src/test/java/com/bigdata/zookeeper/AbstractZooTestCase.java
branches/maven_scaleout/src/test/java/org/
branches/maven_scaleout/src/test/java/org/apache/
branches/maven_scaleout/src/test/java/org/apache/system/
branches/maven_scaleout/src/test/java/org/openrdf/
branches/maven_scaleout/src/test/resources/
branches/maven_scaleout/src/test/resources/com/
branches/maven_scaleout/src/test/resources/com/bigdata/
branches/maven_scaleout/src/test/resources/com/bigdata/classpath_sample.txt
branches/maven_scaleout/src/test/resources/com/bigdata/concurrent/
branches/maven_scaleout/src/test/resources/com/bigdata/concurrent/TestLockManager.xml
branches/maven_scaleout/src/test/resources/com/bigdata/counters/
branches/maven_scaleout/src/test/resources/com/bigdata/counters/httpd/
branches/maven_scaleout/src/test/resources/com/bigdata/counters/httpd/flot-data.txt
branches/maven_scaleout/src/test/resources/com/bigdata/counters/httpd/trial7.txt
branches/maven_scaleout/src/test/resources/com/bigdata/counters/store/
branches/maven_scaleout/src/test/resources/com/bigdata/counters/store/counters-test0.xml
branches/maven_scaleout/src/test/resources/com/bigdata/journal/
branches/maven_scaleout/src/test/resources/com/bigdata/journal/StressTestConcurrentTx.xml
branches/maven_scaleout/src/test/resources/com/bigdata/journal/StressTestGroupCommit.xml
branches/maven_scaleout/src/test/resources/com/bigdata/journal/StressTestGroupCommit2.xml
branches/maven_scaleout/src/test/resources/com/bigdata/journal/StressTestMRMW.xml
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/magic/
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/magic/log4j.properties
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/metrics/
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/metrics/TestMetrics.properties
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/rio/
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/rio/EDSAsyncLoader.properties
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/rules/
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/sail/
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/sail/data-2.ttl
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/sail/log4j.properties
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/sail/sids.rdf
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/sail/testClosure01.nt
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/sail/testIncrementalClosure01-part01.nt
branches/maven_scaleout/src/test/resources/com/bigdata/rdf/sail/testIncrementalClosure01-part02.nt
branches/maven_scaleout/src/test/resources/com/bigdata/service/
branches/maven_scaleout/src/test/resources/com/bigdata/sparse/
branches/maven_scaleout/src/test/resources/com/bigdata/sparse/test.csv
branches/maven_scaleout/src/test/resources/com/bigdata/test/
branches/maven_scaleout/src/test/resources/com/bigdata/test/Experiment-example1.xml
branches/maven_scaleout/src/test/resources/com/bigdata/test/Experiment.dtd
branches/maven_scaleout/src/test/resources/com/bigdata/util/
branches/maven_scaleout/src/test/resources/com/bigdata/util/test-no-headers.csv
branches/maven_scaleout/src/test/resources/com/bigdata/util/test.csv
branches/maven_scaleout/thirdparty/
branches/maven_scaleout/thirdparty/helper/
branches/maven_scaleout/thirdparty/helper/maven-ant-tasks-2.1.1.jar
branches/maven_scaleout/thirdparty/lib/
branches/maven_scaleout/thirdparty/lib/browser-dl.jar
branches/maven_scaleout/thirdparty/lib/browser.jar
branches/maven_scaleout/thirdparty/lib/classserver.jar
branches/maven_scaleout/thirdparty/lib/ctc_utils-5-4-2005.jar
branches/maven_scaleout/thirdparty/lib/cweb-commons-1.1-b2-dev.jar
branches/maven_scaleout/thirdparty/lib/cweb-extser-0.1-b2-dev.jar
branches/maven_scaleout/thirdparty/lib/cweb-junit-ext-1.1-b3-dev.jar
branches/maven_scaleout/thirdparty/lib/dsi-utils-1.0.6-020610.jar
branches/maven_scaleout/thirdparty/lib/fastutil-5.1.5.jar
branches/maven_scaleout/thirdparty/lib/high-scale-lib-v1.1.2.jar
branches/maven_scaleout/thirdparty/lib/iris-0.58.jar
branches/maven_scaleout/thirdparty/lib/jgrapht-jdk1.5-0.7.1.jar
branches/maven_scaleout/thirdparty/lib/jsk-dl.jar
branches/maven_scaleout/thirdparty/lib/jsk-lib.jar
branches/maven_scaleout/thirdparty/lib/jsk-platform.jar
branches/maven_scaleout/thirdparty/lib/lgpl-utils-1.0.6-020610.jar
branches/maven_scaleout/thirdparty/lib/nxparser-6-22-2010.jar
branches/maven_scaleout/thirdparty/lib/reggie-dl.jar
branches/maven_scaleout/thirdparty/lib/reggie.jar
branches/maven_scaleout/thirdparty/lib/start.jar
branches/maven_scaleout/thirdparty/lib/tools.jar
branches/maven_scaleout/thirdparty/lib/zookeeper-3.2.1.jar
branches/maven_scaleout/thirdparty/maven.xml
Removed Paths:
-------------
branches/maven_scaleout/.classpath
branches/maven_scaleout/.project
branches/maven_scaleout/bigdata/
branches/maven_scaleout/bigdata-gom/
branches/maven_scaleout/bigdata-jini/
branches/maven_scaleout/bigdata-rdf/
branches/maven_scaleout/bigdata-sails/
branches/maven_scaleout/btree-record-refactor.xls
branches/maven_scaleout/build.properties
branches/maven_scaleout/build.xml
branches/maven_scaleout/policy.all
branches/maven_scaleout/src/main/java/com/bigdata/bfs/BigdataFileSystem.java
branches/maven_scaleout/src/main/java/com/bigdata/boot/config/
branches/maven_scaleout/src/main/java/com/bigdata/boot/launcher/JavaProcessDescriptor.java
branches/maven_scaleout/src/main/java/com/bigdata/boot/launcher/logging.properties
branches/maven_scaleout/src/main/java/com/bigdata/boot/policy/
branches/maven_scaleout/src/main/java/com/bigdata/btree/AbstractBTree.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/BTree.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/BytesUtil.c
branches/maven_scaleout/src/main/java/com/bigdata/btree/DumpIndexSegment.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/IndexMetadata.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/compile.sh
branches/maven_scaleout/src/main/java/com/bigdata/btree/keys/DefaultKeyBuilderFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/btree/keys/ICUSortKeyGenerator.java
branches/maven_scaleout/src/main/java/com/bigdata/cache/WeakReferenceGlobalLRU.java
branches/maven_scaleout/src/main/java/com/bigdata/counters/AbstractCounterSet.java
branches/maven_scaleout/src/main/java/com/bigdata/counters/AbstractStatisticsCollector.java
branches/maven_scaleout/src/main/java/com/bigdata/counters/httpd/excanvas.pack.js
branches/maven_scaleout/src/main/java/com/bigdata/counters/httpd/jquery.flot.js
branches/maven_scaleout/src/main/java/com/bigdata/counters/httpd/jquery.js
branches/maven_scaleout/src/main/java/com/bigdata/counters/render/flot-end.txt
branches/maven_scaleout/src/main/java/com/bigdata/counters/render/flot-start.txt
branches/maven_scaleout/src/main/java/com/bigdata/disco/config/
branches/maven_scaleout/src/main/java/com/bigdata/executor/config/
branches/maven_scaleout/src/main/java/com/bigdata/gom/clusterIndices.txt
branches/maven_scaleout/src/main/java/com/bigdata/io/DirectBufferPool.java
branches/maven_scaleout/src/main/java/com/bigdata/io/WriteCache.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/AbstractServicesManagerService.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ManageLogicalServiceTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/MonitorCreatePhysicalServiceLocksTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/RestartPersistentServices.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ServicesManagerServer.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/ServicesManagerStartupTask.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/JavaServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/LoadBalancerConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ManagedServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/MaxClientServicesPerHostConstraint.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/MaxDataServicesPerHostConstraint.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ServiceConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/config/ZookeeperServerConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/JiniServiceProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/ProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/AbstractJournal.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/AbstractLocalTransactionManager.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/DiskOnlyStrategy.java
branches/maven_scaleout/src/main/java/com/bigdata/journal/WriteExecutorService.java
branches/maven_scaleout/src/main/java/com/bigdata/loadbalancer/ServiceImpl.java
branches/maven_scaleout/src/main/java/com/bigdata/loadbalancer/config/
branches/maven_scaleout/src/main/java/com/bigdata/mdi/PartitionLocator.java
branches/maven_scaleout/src/main/java/com/bigdata/metadata/config/
branches/maven_scaleout/src/main/java/com/bigdata/process/config/
branches/maven_scaleout/src/main/java/com/bigdata/quorum/config/
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/DefaultExtensionFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/IExtension.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/IExtensionFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/ILexiconConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/IVUtility.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/LexiconConfiguration.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/internal/XSDDecimalIV.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/lexicon/LexiconRelation.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/lexicon/Term2IdWriteProc.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/lexicon/Term2IdWriteTask.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/load/ConcurrentDataLoader.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/load/RDFLoadTaskFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/rules/AbstractRuleFastClosure_3_5_6_7_9.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/rules/RDFJoinNexus.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/store/AbstractTripleStore.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/store/LocalTripleStore.java
branches/maven_scaleout/src/main/java/com/bigdata/rdf/util/
branches/maven_scaleout/src/main/java/com/bigdata/rdf/util/Splitter.config
branches/maven_scaleout/src/main/java/com/bigdata/relation/AbstractResource.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/IMutableResource.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/RelationFusedView.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/locator/DefaultResourceLocator.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/locator/ILocatableResource.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/rule/eval/RuleStats.java
branches/maven_scaleout/src/main/java/com/bigdata/relation/rule/eval/pipeline/DistributedJoinTask.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/AsynchronousOverflowTask.java
branches/maven_scaleout/src/main/java/com/bigdata/resources/BTreeMetadata.java
branches/maven_scaleout/src/main/java/com/bi...
[truncated message content] |
|
From: <sgo...@us...> - 2010-08-26 16:58:37
|
Revision: 3462
http://bigdata.svn.sourceforge.net/bigdata/?rev=3462&view=rev
Author: sgossard
Date: 2010-08-26 16:58:31 +0000 (Thu, 26 Aug 2010)
Log Message:
-----------
[maven_scaleout] : Generating checkstyle and findbugs reports during site goal
Modified Paths:
--------------
branches/maven_scaleout/pom.xml
Added Paths:
-----------
branches/maven_scaleout/src/main/config/
branches/maven_scaleout/src/main/config/checkstyle.xml
Modified: branches/maven_scaleout/pom.xml
===================================================================
--- branches/maven_scaleout/pom.xml 2010-08-25 22:26:34 UTC (rev 3461)
+++ branches/maven_scaleout/pom.xml 2010-08-26 16:58:31 UTC (rev 3462)
@@ -569,8 +569,7 @@
<version>3.1</version>
</dependency>
- <!--<!– JMX –>-->
- <!--<dependency> <!– Pretty sure this isn't needed JDK1.5 + –>-->
+ <!--<!– JMX –>--> <!--<dependency> <!– Pretty sure this isn't needed JDK1.5 + –>-->
<!--<groupId>com.sun.jmx</groupId>-->
<!--<artifactId>jmxri</artifactId>-->
<!--<version>1.2.1</version>-->
@@ -586,7 +585,23 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.5</version>
</plugin>
- </plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+
</reporting>
<repositories>
Added: branches/maven_scaleout/src/main/config/checkstyle.xml
===================================================================
--- branches/maven_scaleout/src/main/config/checkstyle.xml (rev 0)
+++ branches/maven_scaleout/src/main/config/checkstyle.xml 2010-08-26 16:58:31 UTC (rev 3462)
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+ Checkstyle-Configuration: Bigdata
+ Description: none
+-->
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="FileLength"/>
+ <module name="Header">
+ <property name="header" value="/***********************************************************************\n *\n Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved. \nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\n\nthe Free Software Foundation; version 2 of the License.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n**********************************************************************/"/>
+ <property name="ignoreLines" value="3,5"/>
+ </module>
+ <module name="TreeWalker">
+ <module name="FileContentsHolder"/>
+ <module name="JavadocMethod">
+ <property name="scope" value="protected"/>
+ <property name="allowMissingParamTags" value="true"/>
+ <property name="allowMissingThrowsTags" value="true"/>
+ <property name="allowMissingReturnTag" value="true"/>
+ <property name="allowMissingPropertyJavadoc" value="true"/>
+ </module>
+ <module name="JavadocType">
+ <property name="scope" value="public"/>
+ </module>
+ <module name="JavadocVariable">
+ <property name="excludeScope" value="private"/>
+ <property name="scope" value="public"/>
+ </module>
+ <module name="JavadocStyle">
+ <property name="scope" value="public"/>
+ <property name="excludeScope" value="private"/>
+ <property name="checkEmptyJavadoc" value="true"/>
+ <property name="checkFirstSentence" value="false"/>
+ </module>
+ <module name="ConstantName">
+ <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|logger)$"/>
+ </module>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName">
+ <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+ </module>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <!--<module name="FileLength"/>-->
+ <module name="LineLength">
+ <property name="ignorePattern" value="^import *.*$"/>
+ <property name="max" value="150"/>
+ </module>
+ <module name="MethodLength">
+ <property name="max" value="250"/>
+ <property name="countEmpty" value="false"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="8"/>
+ <property name="tokens" value="METHOD_DEF"/>
+ </module>
+ <module name="EmptyForIteratorPad"/>
+ <module name="MethodParamPad"/>
+ <module name="WhitespaceAfter"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap">
+ <property name="tokens" value="BAND, BOR, BSR, BXOR, COLON, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, SL, SR, STAR"/>
+ </module>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad">
+ <property name="tokens" value="RPAREN,TYPECAST"/>
+ </module>
+ <!--<module name="TabCharacter"/>-->
+ <module name="WhitespaceAround">
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
+ </module>
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="AvoidNestedBlocks">
+ <property name="allowInSwitchCase" value="true"/>
+ </module>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ <property name="tokens" value="LITERAL_CATCH"/>
+ </module>
+ <module name="EmptyBlock">
+ <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="HiddenField">
+ <property name="ignoreConstructorParameter" value="true"/>
+ <property name="ignoreSetter" value="true"/>
+ <property name="ignoreAbstractMethods" value="true"/>
+ </module>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows"/>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ </module>
+ <module name="ArrayTypeStyle"/>
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+ <!--<module name="GenericIllegalRegexp">-->
+ <!--<property name="format" value="System\.out\.println"/>-->
+ <!--<property name="ignoreComments" value="true"/>-->
+ <!--<property name="message" value="Don't use System.out.println(), use logging instead."/>-->
+ <!--</module>-->
+ <!--<module name="GenericIllegalRegexp">-->
+ <!--<property name="format" value="System\.err\.println"/>-->
+ <!--<property name="ignoreComments" value="true"/>-->
+ <!--<property name="message" value="Don't use System.err.println(), use logging instead."/>-->
+ <!--</module>-->
+ <!--<module name="GenericIllegalRegexp">-->
+ <!--<property name="format" value="\.printStackTrace"/>-->
+ <!--<property name="ignoreComments" value="true"/>-->
+ <!--<property name="message" value="Don't use printStackTrace(), use logging instead."/>-->
+ <!--</module>-->
+ <module name="DeclarationOrder"/>
+ <module name="MultipleVariableDeclarations"/>
+ <module name="NestedIfDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="MutableException"/>
+ <module name="BooleanExpressionComplexity">
+ <property name="max" value="6"/>
+ </module>
+ <module name="JavaNCSS"/>
+ <module name="CyclomaticComplexity"/>
+ <module name="ClassFanOutComplexity">
+ <property name="max" value="26"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="10"/>
+ </module>
+ <module name="LineLength">
+ <property name="max" value="150"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+ <module name="FallThrough"/>
+ <module name="FinalLocalVariable">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="PARAMETER_DEF"/>
+ </module>
+ <module name="IllegalCatch"/>
+ <module name="ModifiedControlVariable"/>
+ <module name="MultipleStringLiterals"/>
+ <module name="PackageDeclaration"/>
+ <module name="ParameterAssignment"/>
+ <module name="StringLiteralEquality"/>
+ <module name="InterfaceIsType"/>
+ <module name="ThrowsCount">
+ <property name="max" value="3"/>
+ </module>
+ <!--<module name="Header">-->
+ <!--<property name="header" value="/***********************************************************************\n *\n Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved. \nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\n\nthe Free Software Foundation; version 2 of the License.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n\n**********************************************************************/"/>-->
+ <!--<property name="ignoreLines" value="3,5"/>-->
+ <!--</module>-->
+ <module name="RequireThis">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="BooleanExpressionComplexity">
+ <property name="max" value="6"/>
+ </module>
+ <module name="ClassFanOutComplexity">
+ <property name="max" value="26"/>
+ </module>
+ <module name="CyclomaticComplexity"/>
+ <module name="BooleanExpressionComplexity">
+ <property name="max" value="5"/>
+ </module>
+ <module name="BooleanExpressionComplexity">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Identifies conditions that are overly complex"/>
+ <property name="max" value="6"/>
+ </module>
+ </module>
+ <module name="Translation">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="::CHECKSTYLE STOP System.out check"/>
+ <property name="onCommentFormat" value="::CHECKSTYLE RESUME System.out check"/>
+ <property name="checkFormat" value="GenericIllegalRegexp"/>
+ </module>
+</module>
Property changes on: branches/maven_scaleout/src/main/config/checkstyle.xml
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgo...@us...> - 2010-08-27 13:55:03
|
Revision: 3465
http://bigdata.svn.sourceforge.net/bigdata/?rev=3465&view=rev
Author: sgossard
Date: 2010-08-27 13:54:57 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
[maven_scaleout] : Adding mistakenly removed jini sdm-dl jar file.
Modified Paths:
--------------
branches/maven_scaleout/pom.xml
branches/maven_scaleout/thirdparty/maven.xml
Added Paths:
-----------
branches/maven_scaleout/thirdparty/lib/sdm-dl.jar
Modified: branches/maven_scaleout/pom.xml
===================================================================
--- branches/maven_scaleout/pom.xml 2010-08-26 23:17:55 UTC (rev 3464)
+++ branches/maven_scaleout/pom.xml 2010-08-27 13:54:57 UTC (rev 3465)
@@ -362,6 +362,14 @@
<scope>provided</scope>
<classifier>dl</classifier>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.river</groupId>
+ <artifactId>sdm</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ <classifier>dl</classifier>
+ </dependency>
<!-- ************************ End of non-public dependencies ************************ -->
<!-- ************************ End of non-public dependencies ************************ -->
<!-- ************************ End of non-public dependencies ************************ -->
Added: branches/maven_scaleout/thirdparty/lib/sdm-dl.jar
===================================================================
(Binary files differ)
Property changes on: branches/maven_scaleout/thirdparty/lib/sdm-dl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maven_scaleout/thirdparty/maven.xml
===================================================================
--- branches/maven_scaleout/thirdparty/maven.xml 2010-08-26 23:17:55 UTC (rev 3464)
+++ branches/maven_scaleout/thirdparty/maven.xml 2010-08-27 13:54:57 UTC (rev 3465)
@@ -93,7 +93,10 @@
<installJar groupId="org.apache.river" artifactId="classserver" version="2.1" jar="${thirdparty.dir}/classserver.jar" />
<installJar groupId="org.apache.river" artifactId="jsk-lib" version="2.1" jar="${thirdparty.dir}/jsk-lib.jar" />
<installJar groupId="org.apache.river" artifactId="jsk-platform" version="2.1" jar="${thirdparty.dir}/jsk-platform.jar" />
+
<installDlOnly groupId="org.apache.river" artifactId="jsk" version="2.1" dl-jar="${thirdparty.dir}/jsk-dl.jar" />
+ <installDlOnly groupId="org.apache.river" artifactId="sdm" version="2.1" dl-jar="${thirdparty.dir}/sdm-dl.jar" />
+
<installJarWithDl groupId="org.apache.river" artifactId="browser" version="2.1" jar="${thirdparty.dir}/browser.jar" dl-jar="${thirdparty.dir}/browser-dl.jar" />
<installJarWithDl groupId="org.apache.river" artifactId="reggie" version="2.1" jar="${thirdparty.dir}/reggie.jar" dl-jar="${thirdparty.dir}/reggie-dl.jar" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgo...@us...> - 2010-08-30 20:18:24
|
Revision: 3471
http://bigdata.svn.sourceforge.net/bigdata/?rev=3471&view=rev
Author: sgossard
Date: 2010-08-30 20:18:18 +0000 (Mon, 30 Aug 2010)
Log Message:
-----------
[maven_scaleout] : Adding missing jsk-resources jar, since it is referenced in some jini manifests as a classpath dependency.
Modified Paths:
--------------
branches/maven_scaleout/pom.xml
branches/maven_scaleout/thirdparty/maven.xml
Added Paths:
-----------
branches/maven_scaleout/thirdparty/lib/jsk-resources.jar
Modified: branches/maven_scaleout/pom.xml
===================================================================
--- branches/maven_scaleout/pom.xml 2010-08-27 19:53:16 UTC (rev 3470)
+++ branches/maven_scaleout/pom.xml 2010-08-30 20:18:18 UTC (rev 3471)
@@ -322,6 +322,12 @@
<dependency>
<groupId>org.apache.river</groupId>
+ <artifactId>jsk-resources</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.river</groupId>
<artifactId>reggie</artifactId>
<version>2.1</version>
</dependency>
Added: branches/maven_scaleout/thirdparty/lib/jsk-resources.jar
===================================================================
(Binary files differ)
Property changes on: branches/maven_scaleout/thirdparty/lib/jsk-resources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/maven_scaleout/thirdparty/maven.xml
===================================================================
--- branches/maven_scaleout/thirdparty/maven.xml 2010-08-27 19:53:16 UTC (rev 3470)
+++ branches/maven_scaleout/thirdparty/maven.xml 2010-08-30 20:18:18 UTC (rev 3471)
@@ -93,6 +93,7 @@
<installJar groupId="org.apache.river" artifactId="classserver" version="2.1" jar="${thirdparty.dir}/classserver.jar" />
<installJar groupId="org.apache.river" artifactId="jsk-lib" version="2.1" jar="${thirdparty.dir}/jsk-lib.jar" />
<installJar groupId="org.apache.river" artifactId="jsk-platform" version="2.1" jar="${thirdparty.dir}/jsk-platform.jar" />
+ <installJar groupId="org.apache.river" artifactId="jsk-resources" version="2.1" jar="${thirdparty.dir}/jsk-resources.jar" />
<installDlOnly groupId="org.apache.river" artifactId="jsk" version="2.1" dl-jar="${thirdparty.dir}/jsk-dl.jar" />
<installDlOnly groupId="org.apache.river" artifactId="sdm" version="2.1" dl-jar="${thirdparty.dir}/sdm-dl.jar" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgo...@us...> - 2010-08-31 20:15:36
|
Revision: 3474
http://bigdata.svn.sourceforge.net/bigdata/?rev=3474&view=rev
Author: sgossard
Date: 2010-08-31 20:15:29 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
[maven_scaleout] : Optional support for generating code coverage via clover if a license is available.
Modified Paths:
--------------
branches/maven_scaleout/pom.xml
branches/maven_scaleout/src/test/java/com/bigdata/btree/AbstractBTreeTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
Modified: branches/maven_scaleout/pom.xml
===================================================================
--- branches/maven_scaleout/pom.xml 2010-08-31 17:22:33 UTC (rev 3473)
+++ branches/maven_scaleout/pom.xml 2010-08-31 20:15:29 UTC (rev 3474)
@@ -14,8 +14,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<test.codebase.port>23333</test.codebase.port>
- <test.dist.dir>${project.build.directory}/${project.artifactId}-${project.version}-deploy/${project.artifactId}-${project.version}/dist/bigdata</test.dist.dir>
- <dep.libs.dir>${project.build.directory}/dependencies</dep.libs.dir>
<!-- Non-public bigdata dependencies. Used for install and deploy phases. -->
<thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId>
@@ -92,6 +90,7 @@
<include>**/LookupStarter*.class</include>
<include>**/LogUtil.class</include>
<include>**/NicUtil.class</include>
+ <include>**/ConfigurationUtil.class</include>
<include>**/log4j.properties</include>
</includes>
<archive>
@@ -166,7 +165,7 @@
<includeScope>runtime</includeScope>
<excludeClassifiers>dl</excludeClassifiers>
<stripVersion>true</stripVersion>
- <outputDirectory>${dep.libs.dir}/lib</outputDirectory>
+ <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory>
</configuration>
</execution>
<execution>
@@ -179,7 +178,7 @@
<includeScope>provided</includeScope>
<includeClassifiers>dl</includeClassifiers>
<stripVersion>true</stripVersion>
- <outputDirectory>${dep.libs.dir}/lib-dl</outputDirectory>
+ <outputDirectory>${project.build.directory}/dependencies/lib-dl</outputDirectory>
</configuration>
</execution>
<execution>
@@ -192,7 +191,7 @@
<excludeScope>runtime</excludeScope>
<excludeClassifiers>dl</excludeClassifiers><!-- TODO: figure out why this doesn't exclude the dl jars -->
<stripVersion>true</stripVersion>
- <outputDirectory>${dep.libs.dir}/lib-test</outputDirectory>
+ <outputDirectory>${project.build.directory}/dependencies/lib-test</outputDirectory>
</configuration>
</execution>
</executions>
@@ -636,5 +635,46 @@
</repositories>
+ <profiles>
+ <profile>
+ <id>bigdata-clover</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <jdk>1.5</jdk>
+ <!--
+ To use clover with bigdata, you should add the following to your maven settings file, .m2/settings.xml
+ <profile>
+ <id>bigdata-clover</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <maven.clover.licenseLocation>/your/path/to/clover.license</maven.clover.licenseLocation>
+ </properties>
+ </profile>
+
+ -->
+ <excludes><!-- These are stuffed into the lookup starter jar, which uses a stripped classpath without clover. -->
+ <exclude>**/LookupStarter*.java</exclude>
+ <exclude>**/LogUtil.java</exclude>
+ <exclude>**/NicUtil.java</exclude>
+ <exclude>**/ConfigurationUtil.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
</project>
Modified: branches/maven_scaleout/src/test/java/com/bigdata/btree/AbstractBTreeTestCase.java
===================================================================
--- branches/maven_scaleout/src/test/java/com/bigdata/btree/AbstractBTreeTestCase.java 2010-08-31 17:22:33 UTC (rev 3473)
+++ branches/maven_scaleout/src/test/java/com/bigdata/btree/AbstractBTreeTestCase.java 2010-08-31 20:15:29 UTC (rev 3474)
@@ -1643,16 +1643,16 @@
System.err.println("]");
throw ex;
}
- catch( AssertionFailedError ex ) {
- System.err.println("m="+m);
- System.err.print("keys=[");
- for(int i=0; i<keys.length; i++ ) {
- if( i>0 ) System.err.print(", ");
- System.err.print(keys[order[i]]);
- }
- System.err.println("]");
- throw ex;
- }
+// catch( AssertionFailedError ex ) {
+// System.err.println("m="+m);
+// System.err.print("keys=[");
+// for(int i=0; i<keys.length; i++ ) {
+// if( i>0 ) System.err.print(", ");
+// System.err.print(keys[order[i]]);
+// }
+// System.err.println("]");
+// throw ex;
+// }
if(log.isInfoEnabled())
log.info(btree.getBtreeCounters().toString());
Modified: branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
===================================================================
--- branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java 2010-08-31 17:22:33 UTC (rev 3473)
+++ branches/maven_scaleout/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java 2010-08-31 20:15:29 UTC (rev 3474)
@@ -114,11 +114,11 @@
TestSuite suite2 = new TestSuite(suite1.getName());
- Enumeration<TestSuite> e = suite1.tests();
+ Enumeration e = suite1.tests();
while (e.hasMoreElements()) {
- TestSuite suite3 = e.nextElement();
+ TestSuite suite3 = (TestSuite)e.nextElement();
if (suite3.getName().equals("dataset") == false) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgo...@us...> - 2010-09-03 13:40:32
|
Revision: 3505
http://bigdata.svn.sourceforge.net/bigdata/?rev=3505&view=rev
Author: sgossard
Date: 2010-09-03 13:40:22 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
[maven_scaleout] : Initial framework for support maven sub-module aggregation. Previous artifact moved into subdirectory and renamed to bigdata-core.
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/serviceStarter.config
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/boot-processes.xml
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/boot-properties.xml
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/policy/launcher.policy
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/package.html
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/standalone/ServerStarter.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/boot/config/BootComponentTest_boot-processes.xml
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testjini.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/test.xml
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/boot/BootComponentTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractServerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/jini/AbstractServerTestCase.java
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/
branches/maven_scaleout/bigdata-core/LEGAL/
branches/maven_scaleout/bigdata-core/LICENSE.txt
branches/maven_scaleout/bigdata-core/README
branches/maven_scaleout/bigdata-core/README-JINI
branches/maven_scaleout/bigdata-core/bigdata-perf/
branches/maven_scaleout/bigdata-core/bigdata-uml/
branches/maven_scaleout/bigdata-core/contrib/
branches/maven_scaleout/bigdata-core/dsi-utils/
branches/maven_scaleout/bigdata-core/lgpl-utils/
branches/maven_scaleout/bigdata-core/osgi/
branches/maven_scaleout/bigdata-core/overview.html
branches/maven_scaleout/bigdata-core/pom.xml
branches/maven_scaleout/bigdata-core/src/
branches/maven_scaleout/bigdata-core/thirdparty/
branches/maven_scaleout/pom.xml
Removed Paths:
-------------
branches/maven_scaleout/LEGAL/
branches/maven_scaleout/LICENSE.txt
branches/maven_scaleout/README
branches/maven_scaleout/README-JINI
branches/maven_scaleout/bigdata-perf/
branches/maven_scaleout/bigdata-uml/
branches/maven_scaleout/contrib/
branches/maven_scaleout/dsi-utils/
branches/maven_scaleout/lgpl-utils/
branches/maven_scaleout/osgi/
branches/maven_scaleout/overview.html
branches/maven_scaleout/pom.xml
branches/maven_scaleout/src/
branches/maven_scaleout/thirdparty/
Deleted: branches/maven_scaleout/LICENSE.txt
===================================================================
--- branches/maven_scaleout/LICENSE.txt 2010-09-03 12:32:22 UTC (rev 3504)
+++ branches/maven_scaleout/LICENSE.txt 2010-09-03 13:40:22 UTC (rev 3505)
@@ -1,354 +0,0 @@
-The GNU General Public License (GPL)
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies
-
-of this license document, but changing it is not allowed.
-
-
-Preamble
-
-
-The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-
-0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
-
-c) If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License. (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
-
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer
-to distribute corresponding source code. (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
-
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-One line to give the program's name and a brief idea of what it does.
-
-Copyright (C) <year> <name of author>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-Gnomovision version 69, Copyright (C) year name of author
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type `show c' for details.
-
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-`Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-signature of Ty Coon, 1 April 1989
-
-Ty Coon, President of Vice
-
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
Deleted: branches/maven_scaleout/README
===================================================================
Deleted: branches/maven_scaleout/README-JINI
===================================================================
--- branches/maven_scaleout/README-JINI 2010-09-03 12:32:22 UTC (rev 3504)
+++ branches/maven_scaleout/README-JINI 2010-09-03 13:40:22 UTC (rev 3505)
@@ -1,160 +0,0 @@
-Some notes on installation and use follow:
-
-JINI
-
-- jini is used as a service fabric for bigdata. <start up jini and
- then configure your data and metadata services; clients then
- discover those services>
-
-- jini 2.1 may report errors locating the shared libraries from awk,
- dirname, basename and grep when installing under un*x. The problem
- is an assumption about the kernel version. This problem is resolved
- by editing the installer and the launchall script.
- See http://www.jini.org/wiki/Category:Getting_Started and
- http://www.linuxquestions.org/questions/showthread.php?t=370056 for
- a resolution. Here is is in case that link goes away:
-
- Open the bin installer file in an editor. Look for the line
-
- export LD_ASSUME_KERNEL=2.2.5
-
- and replace it with
-
- #xport LD_ASSUME_KERNEL=2.2.5
-
- Save the file and launch.
-
- Once jini is installed, you need to do exactly the same thing for the
- Launch-All script in the installverify directory - this is the script
- that you use the start jini.
-
-- Here are some notes on getting things working on a Fedora Core 6 platform.
- The symptom was that ifconfig was reporting MULTICAST for the interface
- but the jini install was complaining that multicase was not enabled for
- that interface.
-
- Here's what I did:
-
- First, verify that multicast is enabled on eth0 by typing ifconfig and looking for multicast
-
- if it is not enabled type ifconfig eth0 multicast
-
- after that add a default route for multicast broadcasts and bind it to eth0
-
- route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
-
- additionally, I disabled the firewall and I disabled SELinux (but I think the firewall was the big culprit here).
-
-- Downloadable code is NOT required for deployments, but MAY be useful
- for the following purposes:
-
- (a) exposing services to the Jini service browser;
-
- (b) running procedures against services which were deployed before
- the procedures were written;
-
- If you have a complete classpath when running the various services
- then jini will not seek to transfer code from the client as the code
- will be resolved locally by the service.
-
- In order to support downloadable code you need to have an HTTP
- server that will serve class files to jini, including the interfaces
- for all remote services. You can use any HTTP server for this
- purpose, and the server can be located on any machine accessible
- from the host(s) on which you are running jini. As a convenience,
- jini bundles a simple HTTP server that you can start using a command
- like the following:
-
- java -jar ${JINI_HOME}/lib/classserver.jar -port 8080 -dir classes -trees -verbose&
-
- The javadoc describes the logging and command line options for this
- HTTP server.
-
- https://java.sun.com/products/jini/2.1/doc/api/com/sun/jini/tool/ClassServer.html
-
- The directory from which downloadable code will be served should
- contain at least the bigdata jar(s) plus any remote application code
- that you have defined (i.e., code that will run in the server
- process).
-
- The recommended approach to downloadable code is to extract the
- relevant classes into a directory that will be named to the HTTP
- server as follows. Assuming that bigdata.jar is located in the
- current directory:
-
- mkdir classes
- cd classes
- jar xfz ../bigdata.jar
-
- If you deploy a new version of any JAR, then you SHOULD delete the
- classes directory and redeploy all relevant JARs to make sure that
- old class files are not left lying around.
-
-- You can enable NIO support with JERI using TCP by specifying the
- following property to the JVM. Note that JRMP does NOT allow for
- the possibility of NIO.
-
- -Dcom.sun.jini.jeri.tcp.useNIO=true
-
- More information on JERI and NIO is available using the following links.
-
- http://archives.java.sun.com/cgi-bin/wa?A2=ind0504&L=jini-users&P=33490
- http://archives.java.sun.com/cgi-bin/wa?A2=ind0506&L=jini-users&P=9626
- http://archives.java.sun.com/cgi-bin/wa?A2=ind0504&L=jini-users&D=0&P=26542
- http://java.sun.com/products/jini/2.0.1/doc/api/net/jini/jeri/tcp/package-summary.html
-
- Note that one server thread will still be required per concurrent RPC request
- owing to the semantics of RPC (call and wait for response) and the definition
- of JERI.
-
-- Clients downloadable code that will be run on the bigdata services MUST set:
-
- -Djava.rmi.server.codebase=http://.../
-
- where "..." is your host and path
-
- in order for the correct codebase property to be communicated to clients that
- will then download code from that HTTP server. Note: the trailing '/' is
- REQUIRED in your codebase or the generated URLs will NOT resolve correctly.
-
- There is an example of how to do this with the "ant lubm-install" target and
- the "lubmMaster.sh" script.
-
-- Debugging with jini.
-
- See http://java.sun.com/j2se/1.4.2/docs/guide/rmi/javarmiproperties.html for
- some guidance. Among other things, it suggests:
-
- -Djava.rmi.server.logCalls=true
-
- as an aid to debugging. Also try setting
-
- -Dcom.sun.jini.reggie.proxy.debug=1
-
- for the client, e.g., the service browser. Also see:
-
- http://www.adtmag.com/java/articleold.aspx?id=1159
-
- for some (very good) guidance in debugging jini services.
-
- Note: You may have to restart jini locally in order to force download of
- updated classes from the codebase!
-
- See http://archives.java.sun.com/cgi-bin/wa?A2=ind0512&L=jini-users&P=R391&I=-3
- for instructions on setting up an "download jar" (dljar) ANT task that can make
- life much simpler (one supposes).
-
- See http://archives.java.sun.com/cgi-bin/wa?A2=ind0311&L=jini-users&F=&S=&P=7182
- for a description of policy files and
- http://www.dancres.org/cottage/jini-start-examples-2_1.zip for the
- policy files described.
-
- See http://jan.newmarch.name/java/jini/tutorial/Ant.xml for a description of
- one (simple) approach to using ant for jini projects (it does not use the
- dljar ant task but explicitly enumerates what goes where).
-
- See http://jan.newmarch.name/java/jini/tutorial/TroubleShooting.xml#RMI%20Stubs
- for common errors when using RMI stubs.
-
- See https://java.sun.com/products/jini/2.1/doc/api/com/sun/jini/example/browser/package-summary.html
- for the dirty on the jini Service Browser.
Copied: branches/maven_scaleout/bigdata-core/LICENSE.txt (from rev 3496, branches/maven_scaleout/LICENSE.txt)
===================================================================
--- branches/maven_scaleout/bigdata-core/LICENSE.txt (rev 0)
+++ branches/maven_scaleout/bigdata-core/LICENSE.txt 2010-09-03 13:40:22 UTC (rev 3505)
@@ -0,0 +1,354 @@
+The GNU General Public License (GPL)
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies
+
+of this license document, but changing it is not allowed.
+
+
+Preamble
+
+
+The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+
+0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+
+c) If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License. (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer
+to distribute corresponding source code. (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
+
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+One line to give the program's name and a brief idea of what it does.
+
+Copyright (C) <year> <name of author>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+Gnomovision version 69, Copyright (C) year name of author
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+This is free software, and you are welcome to redistribute it
+under certain conditions; type `show c' for details.
+
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+`Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989
+
+Ty Coon, President of Vice
+
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
Copied: branches/maven_scaleout/bigdata-core/README (from rev 3496, branches/maven_scaleout/README)
===================================================================
Copied: branches/maven_scaleout/bigdata-core/README-JINI (from rev 3496, branches/maven_scaleout/README-JINI)
===================================================================
--- branches/maven_scaleout/bigdata-core/README-JINI (rev 0)
+++ branches/maven_scaleout/bigdata-core/README-JINI 2010-09-03 13:40:22 UTC (rev 3505)
@@ -0,0 +1,160 @@
+Some notes on installation and use follow:
+
+JINI
+
+- jini is used as a service fabric for bigdata. <start up jini and
+ then configure your data and metadata services; clients then
+ discover those services>
+
+- jini 2.1 may report errors locating the shared libraries from awk,
+ dirname, basename and grep when installing under un*x. The problem
+ is an assumption about the kernel version. This problem is resolved
+ by editing the installer and the launchall script.
+ See http://www.jini.org/wiki/Category:Getting_Started and
+ http://www.linuxquestions.org/questions/showthread.php?t=370056 for
+ a resolution. Here is is in case that link goes away:
+
+ Open the bin installer file in an editor. Look for the line
+
+ export LD_ASSUME_KERNEL=2.2.5
+
+ and replace it with
+
+ #xport LD_ASSUME_KERNEL=2.2.5
+
+ Save the file and launch.
+
+ Once jini is installed, you need to do exactly the same thing for the
+ Launch-All script in the installverify directory - this is the script
+ that you use the start jini.
+
+- Here are some notes on getting things working on a Fedora Core 6 platform.
+ The symptom was that ifconfig was reporting MULTICAST for the interface
+ but the jini install was complaining that multicase was not enabled for
+ that interface.
+
+ Here's what I did:
+
+ First, verify that multicast is enabled on eth0 by typing ifconfig and looking for multicast
+
+ if it is not enabled type ifconfig eth0 multicast
+
+ after that add a default route for multicast broadcasts and bind it to eth0
+
+ route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
+
+ additionally, I disabled the firewall and I disabled SELinux (but I think the firewall was the big culprit here).
+
+- Downloadable code is NOT required for deployments, but MAY be useful
+ for the following purposes:
+
+ (a) exposing services to the Jini service browser;
+
+ (b) running procedures against services which were deployed before
+ the procedures were written;
+
+ If you have a complete classpath when running the various services
+ then jini will not seek to transfer code from the client as the code
+ will be resolved locally by the service.
+
+ In order to support downloadable code you need to have an HTTP
+ server that will serve class files to jini, including the interfaces
+ for all remote services. You can use any HTTP server for this
+ purpose, and the server can be located on any machine accessible
+ from the host(s) on which you are running jini. As a convenience,
+ jini bundles a simple HTTP server that you can start using a command
+ like the following:
+
+ java -jar ${JINI_HOME}/lib/classserver.jar -port 8080 -dir classes -trees -verbose&
+
+ The javadoc describes the logging and command line options for this
+ HTTP server.
+
+ https://java.sun.com/products/jini/2.1/doc/api/com/sun/jini/tool/ClassServer.html
+
+ The directory from which downloadable code will be served should
+ contain at least the bigdata jar(s) plus any remote application code
+ that you have defined (i.e., code that will run in the server
+ process).
+
+ The recommended approach to downloadable code is to extract the
+ relevant classes into a directory that will be named to the HTTP
+ server as follows. Assuming that bigdata-core.jar is located in the
+ current directory:
+
+ mkdir classes
+ cd classes
+ jar xfz ../bigdata-core.jar
+
+ If you deploy a new version of any JAR, then you SHOULD delete the
+ classes directory and redeploy all relevant JARs to make sure that
+ old class files are not left lying around.
+
+- You can enable NIO support with JERI using TCP by specifying the
+ following property to the JVM. Note that JRMP does NOT allow for
+ the possibility of NIO.
+
+ -Dcom.sun.jini.jeri.tcp.useNIO=true
+
+ More information on JERI and NIO is available using the following links.
+
+ http://archives.java.sun.com/cgi-bin/wa?A2=ind0504&L=jini-users&P=33490
+ http://archives.java.sun.com/cgi-bin/wa?A2=ind0506&L=jini-users&P=9626
+ http://archives.java.sun.com/cgi-bin/wa?A2=ind0504&L=jini-users&D=0&P=26542
+ http://java.sun.com/products/jini/2.0.1/doc/api/net/jini/jeri/tcp/package-summary.html
+
+ Note that one server thread will still be required per concurrent RPC request
+ owing to the semantics of RPC (call and wait for response) and the definition
+ of JERI.
+
+- Clients downloadable code that will be run on the bigdata services MUST set:
+
+ -Djava.rmi.server.codebase=http://.../
+
+ where "..." is your host and path
+
+ in order for the correct codebase property to be communicated to clients that
+ will then download code from that HTTP server. Note: the trailing '/' is
+ REQUIRED in your codebase or the generated URLs will NOT resolve correctly.
+
+ There is an example of how to do this with the "ant lubm-install" target and
+ the "lubmMaster.sh" script.
+
+- Debugging with jini.
+
+ See http://java.sun.com/j2se/1.4.2/docs/guide/rmi/javarmiproperties.html for
+ some guidance. Among other things, it suggests:
+
+ -Djava.rmi.server.logCalls=true
+
+ as an aid to debugging. Also try setting
+
+ -Dcom.sun.jini.reggie.proxy.debug=1
+
+ for the client, e.g., the service browser. Also see:
+
+ http://www.adtmag.com/java/articleold.aspx?id=1159
+
+ for some (very good) guidance in debugging jini services.
+
+ Note: You may have to restart jini locally in order to force download of
+ updated classes from the codebase!
+
+ See http://archives.java.sun.com/cgi-bin/wa?A2=ind0512&L=jini-users&P=R391&I=-3
+ for instructions on setting up an "download jar" (dljar) ANT task that can make
+ life much simpler (one supposes).
+
+ See http://archives.java.sun.com/cgi-bin/wa?A2=ind0311&L=jini-users&F=&S=&P=7182
+ for a description of policy files and
+ http://www.dancres.org/cottage/jini-start-examples-2_1.zip for the
+ policy files described.
+
+ See http://jan.newmarch.name/java/jini/tutorial/Ant.xml for a description of
+ one (simple) approach to using ant for jini projects (it does not use the
+ dljar ant task but explicitly enumerates what goes where).
+
+ See http://jan.newmarch.name/java/jini/tutorial/TroubleShooting.xml#RMI%20Stubs
+ for common errors when using RMI stubs.
+
+ See https://java.sun.com/products/jini/2.1/doc/api/com/sun/jini/example/browser/package-summary.html
+ for the dirty on the jini Service Browser.
Copied: branches/maven_scaleout/bigdata-core/overview.html (from rev 3496, branches/maven_scaleout/overview.html)
===================================================================
--- branches/maven_scaleout/bigdata-core/overview.html (rev 0)
+++ branches/maven_scaleout/bigdata-core/overview.html 2010-09-03 13:40:22 UTC (rev 3505)
@@ -0,0 +1,480 @@
+<html>
+<head>
+<title>bigdata®</title>
+<!-- $Id$ -->
+</head>
+<body>
+
+ <p>
+
+ <em>bigdata®</em> is a scale-out data and computing
+ fabric designed for commodity hardware. The bigdata
+ architecture provides named scale-out indices that are
+ transparently and dynamically key-range partitioned and
+ distributed across a cluster or grid of commodity server
+ platforms. The scale-out indices are B+Trees and remain
+ balanced under insert and removal operations. Keys and
+ values for btrees are variable length byte[]s (the keys are
+ interpreted as unsigned byte[]s).
+
+ Atomic "row" operations are supported for very high
+ concurrency. However, full transactions are also available
+ for applications needing less concurrency but requiring
+ atomic operations that read or write on more than one row,
+ index partition, or index.
+
+ Writes are absorbed on mutable btree instances in append
+ only "journals" of ~200M capacity. On overflow, data in a
+ journal is evicted onto read-optimized, immutable "index
+ segments". The metadata service manages the index
+ definitions, the index partitions, and the assignment of
+ index partitions to data services. A data service
+ encapsulates a journal and zero or more index partitions
+ assigned to that data service, including the logic to handle
+ overflow.
+
+</p><p>
+
+ A deployment is made up of a transaction service, a load
+ balancer service, and a metadata service (with failover
+ redundancy) and many data service instances. bigdata can
+ provide data redundancy internally (by pipelining writes
+ bound for a partition across primary, secondary, ... data
+ service instances for that partition) or it can be deployed
+ over NAS/SAN. bigdata itself is 100% Java and requires a
+ JDK 1.6. There are additional dependencies for the
+ installer (un*x) and for collecting performance counters
+ from the OS (<a
+ href="http://pagesperso-orange.fr/sebastien.godard/">sysstat</a>).
+
+ </p>
+
+ <h2>Architecture</h2>
+
+ <p>
+
+ The bigdata SOA defines three essential services and some
+ additional services. The essential services are the
+ metadata service (provides a locator service for index
+ partitions on data services), the data service (provides
+ read, write, and concurrency control for index partitions),
+ and the transaction service (provides consistent timestamps
+ for commits, facilitates the release of data associated with
+ older commit points, read locks, and transactions). Full
+ transactions are NOT required, so you can use bigdata as a
+ scale-out row store. The load balancer service guides the
+ dynamic redistribution of data across a bigdata federation.
+ There are also client services, which are containers for
+ executing distributed jobs.
+
+ </p>
+
+ <p>
+
+ While other service fabric architectures are contemplated,
+ bigdata services today use JINI 2. to advertise themselves
+ and do service discovery. This means that you must be
+ running a JINI registrar in order for services to be able to
+ register themselves or discover other services. The JINI
+ integration is bundled and installed automatically by
+ default.
+
+ </p>
+
+ <p>
+
+ Zookeeper handles master election, configuration management
+ and global synchronous locks. Zookeeper was developed by
+ Yahoo! as a distributed lock and configuration management
+ service and is now an Apache subproject (part of
+ Hadoop). Among other things, it gets master election
+ protocols right. Zookeeper is bundled and installed
+ automatically by default.
+
+ </p>
+
+ <p>
+
+ The main building blocks for the bigdata architecture are
+ the journal (both an append-only persistence store and a recently
+ introduced read/write store with the ability to recycle historical
+ commit points), the mutable
+ B+Tree (used to absorb writes), and the read-optimized
+ immutable B+Tree (aka the index segment). Highly efficient
+ bulk index builds are used to transfer data absorbed by a
+ mutable B+Tree on a journal into index segment files. Each
+ for index segment contains data for a single partition of a
+ scale-out index. In order to read from an index partition,
+ a consistent view is created by dynamically fusing data for
+ that index partition, including any recent writes on the
+ current journal, any historical writes that are in the
+ process of being transferred onto index segments, and any
+ historical index segments that also contain data for that
+ view. Periodically, index segments are merged together, at
+ which point deleted tuples are purged from the view.
+
+</p>
+
+<p>
+
+ Bigdata periodically releases data associated with older
+ commit points, freeing up disk resources. The transaction
+ service is configured with a minimum release age in
+ milliseconds. This can be ZERO (0L) milliseconds, in which
+ case historical views may be released if there are no read
+ locks for that commit point. The minimum release age can
+ also be hours or days if you want to keep historical states
+ around for a while. When a data service overflows, it will
+ consult the transaction service to determine the effective
+ release time and release any old journals or index segments
+ no longer required to maintain views GT that release time.
+</p><p>
+ An immortal or temporal database can be realized by
+ specifying Long#MAX_VALUE for the minimum release age. In
+ this case, the old journals and index segments will all be
+ retained and you can query any historical commit point of
+ the database at any time.
+
+ </p><p>
+
+ An detailed architecture whitepaper for bigdata is posted only and
+ linked from our <a href="www.bigdata.com/blog">blog</a>.
+
+ </p>
+
+ <h2>Sparse row store</h2>
+
+ <p>
+
+ The <em>SparseRowStore</em> provides a column flexible row
+ store similar to Google's bigtable or HBase, including very
+ high read/write concurrency and ACID operations on logical
+ "rows". Internally, a "global row store" instance is used
+ to maintain metadata on relations declared within a bigdata
+ federation. You can use this instance to store your own
+ data, or you can create your own named row store instances.
+ However, there is no REST api for the row store at this time
+ (trivial to be sure, but not something that we have gotten
+ around to yet).
+
+</p><p>
+
+ In fact, it is trivial to realize bigtable semantics with
+ bigdata - all you need to do is exercise a specific protocol
+ when forming the keys for your scale-out indices and then
+ you simply choose to NOT use transact...
[truncated message content] |
|
From: <ble...@us...> - 2010-09-07 19:04:44
|
Revision: 3512
http://bigdata.svn.sourceforge.net/bigdata/?rev=3512&view=rev
Author: blevine218
Date: 2010-09-07 19:04:36 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
first checkin of framework for bigdata integration tests
Added Paths:
-----------
branches/maven_scaleout/bigdata-integ/
branches/maven_scaleout/bigdata-integ/.classpath
branches/maven_scaleout/bigdata-integ/.project
branches/maven_scaleout/bigdata-integ/.settings/
branches/maven_scaleout/bigdata-integ/.settings/.jsdtscope
branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.jdt.core.prefs
branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.component
branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.project.facet.core.xml
branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.container
branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.name
branches/maven_scaleout/bigdata-integ/.settings/org.maven.ide.eclipse.prefs
branches/maven_scaleout/bigdata-integ/pom.xml
branches/maven_scaleout/bigdata-integ/src/
branches/maven_scaleout/bigdata-integ/src/main/
branches/maven_scaleout/bigdata-integ/src/main/java/
branches/maven_scaleout/bigdata-integ/src/main/resources/
branches/maven_scaleout/bigdata-integ/src/test/
branches/maven_scaleout/bigdata-integ/src/test/java/
branches/maven_scaleout/bigdata-integ/src/test/java/com/
branches/maven_scaleout/bigdata-integ/src/test/java/com/bigdata/
branches/maven_scaleout/bigdata-integ/src/test/java/com/bigdata/test/
branches/maven_scaleout/bigdata-integ/src/test/java/com/bigdata/test/FakeTest.java
branches/maven_scaleout/bigdata-integ/src/test/resources/
Added: branches/maven_scaleout/bigdata-integ/.classpath
===================================================================
--- branches/maven_scaleout/bigdata-integ/.classpath (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.classpath 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-sun-1.6.0.20">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: branches/maven_scaleout/bigdata-integ/.project
===================================================================
--- branches/maven_scaleout/bigdata-integ/.project (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.project 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>rds-integration-test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Added: branches/maven_scaleout/bigdata-integ/.settings/.jsdtscope
===================================================================
--- branches/maven_scaleout/bigdata-integ/.settings/.jsdtscope (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.settings/.jsdtscope 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.jdt.core.prefs 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,7 @@
+#Tue Sep 07 12:06:36 EDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.component
===================================================================
--- branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.component (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.component 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="rds-integration-test">
+ <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+ <property name="context-root" value="rds-integration-test"/>
+ <property name="java-output-path"/>
+ </wb-module>
+</project-modules>
Added: branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.java" version="5.0"/>
+</faceted-project>
Added: branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: branches/maven_scaleout/bigdata-integ/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- branches/maven_scaleout/bigdata-integ/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ branches/maven_scaleout/bigdata-integ/.settings/org.maven.ide.eclipse.prefs 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,9 @@
+#Wed May 12 12:42:51 EDT 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: branches/maven_scaleout/bigdata-integ/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-integ/pom.xml (rev 0)
+++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+
+ <parent>
+ <groupId>com.bigdata</groupId>
+ <artifactId>bigdata</artifactId>
+ <version>0.83.2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.bigdata</groupId>
+ <artifactId>bigdata-integration-test</artifactId>
+ <name>bigdata Integration Tests</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ <version>2.4.3-alpha-1</version>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.bigdata</groupId>
+ <artifactId>bigdata-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: branches/maven_scaleout/bigdata-integ/src/test/java/com/bigdata/test/FakeTest.java
===================================================================
--- branches/maven_scaleout/bigdata-integ/src/test/java/com/bigdata/test/FakeTest.java (rev 0)
+++ branches/maven_scaleout/bigdata-integ/src/test/java/com/bigdata/test/FakeTest.java 2010-09-07 19:04:36 UTC (rev 3512)
@@ -0,0 +1,69 @@
+/***********************************************************************
+ *
+ * $Id$
+ *
+ * Copyright (c) 2000-2010 Nokia Corporation.
+ *
+ * This material, including documentation and any related computer
+ * programs, is protected by copyright controlled by Nokia Corporation.
+ * All rights are reserved. Copying, including reproducing, storing,
+ * adapting or translating, any or all of this material requires the prior
+ * written consent of Nokia Corporation. This material also contains
+ * confidential information which may not be disclosed to others without
+ * the prior written consent of Nokia Corporation.
+ **********************************************************************/
+package com.bigdata.test;
+
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author blevine
+ *
+ */
+public class FakeTest
+{
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception
+ {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception
+ {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception
+ {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception
+ {
+ }
+
+ @Test
+ public void theTest()
+ {
+ System.out.println("HELLO WORLD!!!!");
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgo...@us...> - 2010-09-13 14:54:07
|
Revision: 3534
http://bigdata.svn.sourceforge.net/bigdata/?rev=3534&view=rev
Author: sgossard
Date: 2010-09-13 14:53:57 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
[merge dev-btm --> maven_scaleout] : Merge of ^/branches/dev-btm , revision 3463. The merged changes from the dev-btm branch included trunk revisions 3432:3460.
Revision Links:
--------------
http://bigdata.svn.sourceforge.net/bigdata/?rev=3463&view=rev
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/process/JiniServiceProcessHelper.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractLocalTransactionManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/BufferMode.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/IConcurrencyManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/ILocalTransactionManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/ITransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/JournalTransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/TransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/WriteExecutorService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/loadbalancer/EmbeddedLoadBalancer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/loadbalancer/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/PartitionLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/AdminProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/Constants.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/PrivateInterface.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/ServiceProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/process/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/BigdataSail.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/spo/SPO.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/AsynchronousOverflowTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/CompactingMergeTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/ResourceManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractIndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractScaleOutFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractTransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/CommitTimeIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DataService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DefaultClientDelegate.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DefaultServiceFederationDelegate.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DistributedTransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/EmbeddedFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IBigdataFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IEventReceivingService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IFederationDelegate.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IMetadataService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IServiceShutdown.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ListIndicesTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/MetadataIndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/NoCacheMetadataIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ShardLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/JiniFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/LoadBalancerServer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/MetadataServer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/lookup/LoadBalancerClient.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/lookup/TransactionServiceClient.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/master/ServiceMap.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/util/DumpFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/util/JiniServicesHelper.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/ClientIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/RawDataServiceTupleIterator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/shard/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/AdminProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/Constants.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/PrivateInterface.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/ServiceProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/Util.java
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestRingBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/DestroyTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceConfigurationMonitoring.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceStarter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/config/TestServiceConfiguration.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestOptionals.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/MockLocalTransactionManager.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/MockTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/AbstractEmbeddedFederationTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEventReceiver.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMove.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestRestartSafe.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTask.java
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedIndexStore.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedShardLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ShardManagement.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/TxState.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/lookup/ShardLocatorClient.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/EmbeddedTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceConfigurationMonitoringRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceStarterRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/config/TestServiceConfigurationRemote.java
Property Changed:
----------------
branches/maven_scaleout/
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/main/java/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/
Property changes on: branches/maven_scaleout
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440
/branches/fko:3150-3194
/trunk:3379-3430
+ /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -35,6 +35,7 @@
"net.jini.core.constraint.RemoteMethodControl",
"net.jini.id.ReferentUuid",
"com.bigdata.service.Service",
+ "com.bigdata.service.ShardManagement",
"com.bigdata.service.EventReceivingService"
};
}
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart 2010-09-13 14:53:57 UTC (rev 3534)
@@ -218,6 +218,12 @@
os.path.join(self.appHome, "lib", "start.jar"),
os.path.join(self.appHome, "lib", "log4j.jar"),
os.path.join(self.appHome, "lib", "bigdata-core.jar"),
+ os.path.join(self.appHome, "lib", "fastutil.jar"),
+ os.path.join(self.appHome, "lib", "dsiutils.jar"),
+ os.path.join(self.appHome, "lib", "cweb-extser.jar"),
+ os.path.join(self.appHome, "lib", "icu4j.jar"),
+ os.path.join(self.appHome, "lib", "ctc_utils.jar"),
+ os.path.join(self.appHome, "lib", "lgplutils.jar"),
os.path.join(self.appHome, "lib", "zookeeper.jar"),
os.path.join(self.appHome, "lib", "jsk-lib.jar") ]
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -629,12 +629,15 @@
"jini",
"org.apache.zookeeper.server.quorum.QuorumPeerMain",
- "com.bigdata.service.jini.TransactionServer",
- "com.bigdata.service.jini.MetadataServer",
+//BTM "com.bigdata.service.jini.TransactionServer",
+//BTM "com.bigdata.service.jini.MetadataServer",
"com.bigdata.service.jini.DataServer",
- "com.bigdata.service.jini.LoadBalancerServer",
-//BTM "com.bigdata.loadbalancer.ServiceImpl",
- "com.bigdata.service.jini.ClientServer"
+//BTM "com.bigdata.service.jini.LoadBalancerServer",
+ "com.bigdata.service.jini.ClientServer",
+
+"com.bigdata.transaction.ServiceImpl",
+"com.bigdata.metadata.ServiceImpl",
+"com.bigdata.loadbalancer.ServiceImpl"
};
@@ -1191,6 +1194,52 @@
}
//BTM - BEGIN
+com.bigdata.transaction.ServiceImpl {
+ constraints = new IServiceConstraint[] {
+ new JiniRunningConstraint(),
+ new ZookeeperRunningConstraint(),
+ new HostAllowConstraint(bigdata.txs)
+ };
+
+ properties = new NV[] {
+ new NV(TransactionServer.Options.MIN_RELEASE_AGE, "0"),
+ };
+
+ args = new String[]{
+ "-Xmx200m",
+ "-Djava.util.logging.config.file=@NAS@/dist/bigdata/var/config/logging/transaction-logging.properties",
+ "-Dlog4j.configuration=@NAS@/dist/bigdata/var/config/logging/transaction-logging.properties",
+ "-Dlog4j.primary.configuration=@NAS@/dist/bigdata/var/config/logging/transaction-logging.properties",
+ "-DusingServiceConfiguration=true",
+ "-Dbigdata.logDir=@NAS@/dist/bigdata/var/log",
+ "-DappHome=@APP_HOME@",
+ "-Dconfig=@NAS@/dist/bigdata/var/config/jini/transaction.config"
+ };
+}
+
+com.bigdata.metadata.ServiceImpl {
+ constraints = new IServiceConstraint[] {
+ new JiniRunningConstraint(),
+ new ZookeeperRunningConstraint(),
+ new HostAllowConstraint(bigdata.mds)
+ };
+
+ properties = new NV[] {
+ new NV(MetadataServer.Options.OVERFLOW_ENABLED,"false")
+ };
+
+ args = new String[]{
+ "-Xmx200m",
+ "-Djava.util.logging.config.file=@NAS@/dist/bigdata/var/config/logging/shardlocator-logging.properties",
+ "-Dlog4j.configuration=@NAS@/dist/bigdata/var/config/logging/shardlocator-logging.properties",
+ "-Dlog4j.primary.configuration=@NAS@/dist/bigdata/var/config/logging/shardlocator-logging.properties",
+ "-DusingServiceConfiguration=true",
+ "-Dbigdata.logDir=@NAS@/dist/bigdata/var/log",
+ "-DappHome=@APP_HOME@",
+ "-Dconfig=@NAS@/dist/bigdata/var/config/jini/shardlocator.config"
+ };
+}
+
com.bigdata.loadbalancer.ServiceImpl {
constraints = new IServiceConstraint[] {
new JiniRunningConstraint(),
@@ -1727,34 +1776,17 @@
// When true, a pre-existing job with the same name is deleted first.
deleteJob = true;
- // ALTERNATIVE 1: Start http servers for the directories containing
- // the ontology and the data files:
+ // Scanner identifies resources to be loaded.
+ resourceScannerFactory = com.bigdata.service.jini.master.FileSystemScanner.newFactory(
+ new File("@NAS@/lubm/U10"), // dataDir
+ //new File("/nas/metrics/lehigh/U10-compressed"), // dataDir
+ new com.bigdata.rdf.load.RDFFilenameFilter() // optional filename filter.
+ );
- ontologyDir = new File("/tmp/lubm");
- dataDir = new File("/tmp/lubm/datafiles");
- static dataServer = new com.bigdata.service.jini.master.FileServer(
- dataDir, 20, 8702, 20);
- static ontologyServer = new com.bigdata.service.jini.master.FileServer(
- ontologyDir, 5, 8703, 5);
- resourceScannerFactory =
- com.bigdata.service.jini.master.FileSystemScannerServer.newFactory(
- dataDir,
- new com.bigdata.rdf.load.RDFFilenameFilter(), dataServer);
- ontology = com.bigdata.service.jini.master.FileServer.getURL(
- ontologyServer, "/univ-bench.owl");
+ // The ontology to load (file or directory) when the KB is created.
+ ontology = new File("@install.lubm.config.dir@/univ-bench.owl");
+ //ontology = new File("/nas/metrics/lehigh/univ-bench.owl");
- // ALTERNATIVE 2: Supply the data files and ontology from an
- // external web server.
-
-// ontology = new URL("http://stub/lubm/univ-bench.owl");
-// resourceScannerFactory =
-// com.bigdata.service.jini.master.URLListScanner.newFactory(
-// new URL[] {
-// new URL("http://stub/lubm/datafiles/University0_0.owl"),
-// new URL("http://stub/lubm/datafiles/University0_1.owl"),
-// ...
-// });
-
// The maximum thread pool size for RDF parser tasks.
//parserPoolSize = 5;
@@ -1805,7 +1837,7 @@
forceOverflow = false;
/* How long the master will wait in milliseconds to discover the services
- * that you specify for [servicesTemplates].
+ * that you specify for [servicesTemplates] and [clientsTemplate].
*/
awaitServicesTimeout = 10000;
@@ -1849,8 +1881,25 @@
};
- // Minimum number of client services for distributed execution.
- clientServiceCount = bigdata.clientServiceCount;
+ /* Template for matching the services to which the clients will be
+ * distributed for execution. Normally you will specify
+ * IClientService as the interface to be discovered. While it is
+ * possible to run tasks on an IDataService or even an
+ * IMetadataService since they both implement IRemoteExecutor, it
+ * is generally discouraged unless the tasks require explicit
+ * access to the local index partitions for their execution.
+ */
+ clientsTemplate = new ServicesTemplate(
+ bigdata.clientServiceCount, // minMatches
+ new ServiceTemplate(
+ null, //serviceID
+ new Class[]{
+ com.bigdata.service.IClientService.class
+ },
+ null // attributes
+ ),
+ null // filter
+ );
/*
* RDF distributed data loader options.
@@ -1891,7 +1940,7 @@
forceOverflow = true;
/* How long the master will wait in milliseconds to discover the services
- * that you specify for [servicesTemplates].
+ * that you specify for [servicesTemplates] and [clientsTemplate].
*/
awaitServicesTimeout = 10000;
@@ -1935,8 +1984,25 @@
};
- // Minimum number of client services for distributed execution.
- clientServiceCount = bigdata.clientServiceCount;
+ /* Template for matching the services to which the clients will be
+ * distributed for execution. Normally you will specify
+ * IClientService as the interface to be discovered. While it is
+ * possible to run tasks on an IDataService or even an
+ * IMetadataService since they both implement IRemoteExecutor, it
+ * is generally discouraged unless the tasks require explicit
+ * access to the local index partitions for their execution.
+ */
+ clientsTemplate = new ServicesTemplate(
+ bigdata.clientServiceCount, // minMatches
+ new ServiceTemplate(
+ null, //serviceID
+ new Class[]{
+ com.bigdata.service.IClientService.class
+ },
+ null // attributes
+ ),
+ null // filter
+ );
/*
* RDF distributed data loader options.
@@ -2047,7 +2113,7 @@
}
-com.bigdata.service.jini.util.BroadcastSighup {
+com.bigdata.service.jini.BroadcastSighup {
pushConfig = false;
@@ -2111,8 +2177,24 @@
};
- // Minimum number of client services for distributed execution.
- clientServiceCount = bigdata.clientServiceCount;
+ /* Template for matching the services to which the clients will be
+ * distributed for execution. Normally you will specify
+ * IClientService as the interface to be discovered. While it is
+ * possible to run tasks on an IDataService or even an
+ * IMetadataService since they both implement IRemoteExecutor, it
+ * is generally discouraged unless the tasks require explicit
+ * access to the local index partitions for their execution.
+ */
+ clientsTemplate = new ServicesTemplate(
+ bigdata.clientServiceCount, // minMatches
+ new ServiceTemplate(
+ null, //serviceID
+ new Class[]{
+ com.bigdata.service.IClientService.class
+ },
+ null), // attributes
+ null // filter
+ );
/* The initial #of index partitions for the scale-out index
* (computed as #partitions per data service). Choose at least
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -37,6 +37,7 @@
import com.bigdata.rdf.lexicon.LexiconRelation;
import com.bigdata.rdf.lexicon.LexiconKeyOrder;
import com.bigdata.rawstore.Bytes;
+import com.bigdata.DataFinder;
import java.net.URL;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeUnit.*;
@@ -1743,13 +1744,13 @@
// Scanner identifies resources to be loaded.
resourceScannerFactory = com.bigdata.service.jini.master.URLListScanner.newFactory(
- new File("/nas/data/lubm/U1000").toURI().toURL(), // dataDir
+ DataFinder.bestURL("/nas/data/lubm/U1000")// dataDir
new com.bigdata.rdf.load.RDFFilenameFilter() // optional filename filter.
);
// The ontology to load (file or directory) when the KB is created.
//ontology = new File("@install.lubm.config.dir@/univ-bench.owl");
- ontology = new File("/nas/data/lubm/univ-bench.owl").toURI().toURL();
+ ontology = DataFinder.bestURL("/nas/data/lubm/univ-bench.owl");
// The maximum thread pool size for RDF parser tasks.
//parserPoolSize = 5;
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -16,16 +16,29 @@
com.bigdata.metadata {
- private static exportIpAddr =
+ // for exporting the service
+
+ private static serverExporterIpAddr =
NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
- private static exportPort =
+ private static serverExporterPort =
Integer.parseInt( System.getProperty("exportPort", "0") );
+ private static serverEnableDgc = false;
+ private static serverKeepAlive = true;
+ private static serverExporterTcpServerEndpoint =
+ TcpServerEndpoint.getInstance(serverExporterIpAddr, serverExporterPort);
- groupsToJoin = ConfigDeployUtil.getGroupsToDiscover();
- locatorsToJoin = ConfigDeployUtil.getLocatorsToDiscover();
+ // for exporting remote futures
- private static exporterTcpServerEndpoint =
- TcpServerEndpoint.getInstance(exportIpAddr, exportPort);
+ private static futureExporterIpAddr =
+ NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.dataNetwork"), false);
+ private static futureExporterPort = 0;
+ private static futureEnableDgc = true;
+ private static futureKeepAlive = false;
+ private static futureExporterTcpServerEndpoint =
+ TcpServerEndpoint.getInstance(futureExporterIpAddr, futureExporterPort);
+
+ //shared by both exporters
+
private static serverILFactory =
new BasicILFactory(
new BasicMethodConstraints(
@@ -38,11 +51,20 @@
serverExporter =
new BasicJeriExporter
- (TcpServerEndpoint.getInstance(exportIpAddr,exportPort),
- serverILFactory,
- false,
- true);
+ (serverExporterTcpServerEndpoint,
+ serverILFactory,
+ serverEnableDgc,
+ serverKeepAlive);
+ futureExporter =
+ new BasicJeriExporter
+ (futureExporterTcpServerEndpoint,
+ futureILFactory,
+ futureEnableDgc,
+ futureKeepAlive);
+ groupsToJoin = ConfigDeployUtil.getGroupsToDiscover();
+ locatorsToJoin = ConfigDeployUtil.getLocatorsToDiscover();
+
static discoveryManager = new LookupDiscoveryManager(groupsToJoin,
locatorsToJoin,
null,
@@ -55,15 +77,15 @@
}
net.jini.discovery.LookupDiscovery {
- multicastRequestHost = com.bigdata.metadata.exportIpAddr;
+ multicastRequestHost = com.bigdata.metadata.serverExporterIpAddr;
multicastInterfaces = new NetworkInterface[] {
- NicUtil.getNetworkInterface(com.bigdata.metadata.exportIpAddr)
+ NicUtil.getNetworkInterface(com.bigdata.metadata.serverExporterIpAddr)
};
}
net.jini.lookup.ServiceDiscoveryManager {
eventListenerExporter =
new BasicJeriExporter
- (com.bigdata.metadata.exporterTcpServerEndpoint,
+ (com.bigdata.metadata.serverExporterTcpServerEndpoint,
com.bigdata.metadata.serverILFactory, false, false);
}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties 2010-09-13 14:53:57 UTC (rev 3534)
@@ -210,3 +210,5 @@
#log4j.logger.com.bigdata.boot.BootComponentTest=DEBUG
#log4j.logger.com.bigdata.boot.launcher.ConfigReaderUnitTest=DEBUG
#log4j.logger.com.bigdata.process.ProcessConfigXmlHandlerTest=DEBUG
+
+log4j.logger.com.bigdata.transaction=DEBUG
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties 2010-09-13 14:53:57 UTC (rev 3534)
@@ -36,3 +36,6 @@
############################################################
#log4j.logger.com.bigdata.metadata=DEBUG
+#log4j.logger.com.bigdata.metadata.EmbeddedShardLocator=DEBUG
+#log4j.logger.com.bigdata.metadata.EmbeddedIndexStore=DEBUG
+
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties 2010-09-13 14:53:57 UTC (rev 3534)
@@ -36,4 +36,5 @@
############################################################
#log4j.logger.com.bigdata.transaction=DEBUG
+#log4j.logger.com.bigdata.transaction.EmbeddedTransactionService=DEBUG
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java:3463
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -10,6 +10,7 @@
import org.slf4j.LoggerFactory;
import java.io.*;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
@@ -61,6 +62,10 @@
return DEFAULT_SEARCH.getBestURI(path);
}
+ public static URL bestURL(String path) throws MalformedURLException {
+ return DEFAULT_SEARCH.getBestURI(path).toURL();
+ }
+
public static DataFinder defaultFinder(){
return DEFAULT_SEARCH;
}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
+ /branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -154,7 +154,7 @@
public boolean add(final T ref) throws IllegalStateException {
if (ref == null)
- throw new IllegalArgumentException();
+ throw new NullPointerException();
beforeOffer( ref );
@@ -178,7 +178,7 @@
public boolean offer(final T ref) {
if (ref == null)
- throw new IllegalArgumentException();
+ throw new NullPointerException();
beforeOffer( ref );
@@ -387,12 +387,12 @@
if (index < 0 || index >= size)
throw new IllegalArgumentException();
- if (index + 1 == size) {
-
- // remove the LRU position.
- return remove();
-
- }
+// if (index + 1 == size) {
+//
+// // remove the LRU position.
+// return remove();
+//
+// }
/*
* Otherwise we are removing some non-LRU element.
@@ -409,7 +409,7 @@
for (;;) {
- int nexti = (i + 1) % capacity; // update index.
+ final int nexti = (i + 1) % capacity; // update index.
if (nexti != head) {
@@ -491,10 +491,9 @@
*/
final public boolean scanHead(final int nscan, final T ref) {
- assert nscan > 0;
-// if (nscan <= 0)
-// throw new IllegalArgumentException();
-//
+ if (nscan <= 0)
+ throw new IllegalArgumentException();
+
if (ref == null)
throw new IllegalArgumentException();
@@ -581,6 +580,9 @@
public boolean contains(final Object ref) {
+ if (ref == null)
+ throw new NullPointerException();
+
// MRU to LRU scan.
for (int n = 0, i = tail; n < size; n++) {
@@ -601,7 +603,8 @@
throw new NullPointerException();
if (c == this)
- throw new IllegalArgumentException();
+ return true;
+// throw new IllegalArgumentException();
for( Object e : c ) {
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
+ /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -300,7 +300,7 @@
private long EXECUTOR_TERMINATION_TIMEOUT = 1L*60L*1000L;
public ShutdownThread() {
- super("Build Server Request Service Shutdown thread");
+ super("callable executor service shutdown thread");
setDaemon(false);
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -28,12 +28,16 @@
* serviceConfigMonitor
* com.bigdata.service.jini.DataServer
* lock0000000000 (Ephemeral)
- * com.bigdata.service.jini.LoadBalancerServer or com.bigdata.loadbalancer.ServiceImpl
+ * com.bigdata.service.jini.LoadBalancerServer
* lock0000000000 (Ephemeral)
* com.bigdata.service.jini.MetadataServer
* lock0000000000 (Ephemeral)
* com.bigdata.service.jini.TransactionServer
* lock0000000000 (Ephemeral)
+ * com.bigdata.loadbalancer.ServiceImpl
+ * lock0000000000 (Ephemeral)
+ * com.bigdata.metadata.ServiceImpl
+ * lock0000000000 (Ephemeral)
* createPhysicalService
* config
* com.bigdata.service.jini.DataServer {DataServiceConfiguration}
@@ -43,7 +47,7 @@
* logicalService0000000000
* election
* physicalServiceb2bf8b98-da0c-42f5-ac65-027bf3304429 (Ephemeral) {UUID}
- * com.bigdata.service.jini.LoadBalancerServer or com.bigdata.loadbalancer.ServiceImpl {LoadBalancerConfiguration}
+ * com.bigdata.service.jini.LoadBalancerServer
* logicalService0000000000
* election
* physicalService911a9b28-7396-4932-ab80-77078119e7e2 (Ephemeral) {UUID}
@@ -55,15 +59,27 @@
* logicalService0000000000
* election
* physicalService87522080-2da6-42be-84a8-4a863b420042 (Ephemeral) {UUID}
+ * com.bigdata.loadbalancer.ServiceImpl {LoadBalancerConfiguration}
+ * logicalService0000000000
+ * election
+ * physicalService911a9b28-7396-4932-ab80-77078119e7e3 (Ephemeral) {UUID}
+ * com.bigdata.metadata.ServiceImpl {MetadataServiceConfiguration}
+ * logicalService0000000000
+ * election
+ * physicalServicec0f35d2e-0a20-40c4-bb76-c97e7cb72eb4 (Ephemeral) {UUID}
* services
* com.bigdata.service.jini.TransactionServer
* instances (persistent znodes)
- * com.bigdata.service.jini.LoadBalancerServer or com.bigdata.loadbalancer.ServiceImpl
+ * com.bigdata.service.jini.LoadBalancerServer
* instances (persistent znodes)
* com.bigdata.service.jini.MetadataServer
* instances (persistent znodes)
* com.bigdata.service.jini.DataServerServer
* instances (persistent znodes)
+ * com.bigdata.loadbalancer.ServiceImpl
+ * instances (persistent znodes)
+ * com.bigdata.metadata.ServiceImpl
+ * instances (persistent znodes)
* </pre>
*
* Each {@link ServiceConfiguration} znode defines the service type, the target
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -81,6 +81,14 @@
boolean classCastOk = false;
if( AbstractServer.class.isAssignableFrom(cls) ) {
classCastOk = true;
+ } else if( com.bigdata.service.jini.MetadataServer.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
+ } else if( com.bigdata.metadata.ServiceImpl.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
+ } else if( com.bigdata.service.jini.TransactionServer.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
+ } else if( com.bigdata.transaction.ServiceImpl.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
} else if( com.bigdata.service.jini.LoadBalancerServer.class.isAssignableFrom(cls) ) {
classCastOk = true;
} else if( com.bigdata.loadbalancer.ServiceImpl.class.isAssignableFrom(cls) ) {
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -34,7 +34,6 @@
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
-import java.net.InetAddress;
import java.util.Arrays;
import java.util.Date;
import java.util.Enumeration;
@@ -132,8 +131,6 @@
public final Properties properties;
public final String[] jiniOptions;
- private final String serviceIpAddr;
-
protected void toString(StringBuilder sb) {
super.toString(sb);
@@ -181,12 +178,6 @@
} else {
log.warn("groups = " + Arrays.toString(this.groups));
}
-
- try {
- this.serviceIpAddr = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
- } catch(IOException e) {
- throw new ConfigurationException(e.getMessage(), e);
- }
}
/**
@@ -262,6 +253,9 @@
"net.jini.jeri.tcp.TcpServerEndpoint",
"net.jini.discovery.LookupDiscovery",
+//BTM
+"net.jini.discovery.LookupDiscoveryManager",
+
"net.jini.core.discovery.LookupLocator",
"net.jini.core.entry.Entry",
"net.jini.lookup.entry.Name",
@@ -434,7 +428,6 @@
}
out.write("}\n");
-
out.write("\n\n" + className + " {\n");
writeServiceDescription(out);
out.write("}\n");
@@ -483,6 +476,9 @@
final ServiceDir serviceDir = new ServiceDir(this.serviceDir);
+ String serviceIpAddr = NicUtil.getIpAddress ( "default.nic", "default", false ) ;
+ if ( null == serviceIpAddr )
+ throw new IOException ( "Can't get a host ip address" ) ;
final Hostname hostName = new Hostname(serviceIpAddr);
final ServiceUUID serviceUUID = new ServiceUUID(this.serviceUUID);
@@ -831,6 +827,7 @@
final ServiceID serviceID = JiniUtil
.uuid2ServiceID(serviceUUID);
+System.out.println("\n**** JiniServiceConfiguration.awaitServiceDiscoveryOrDeath: serviceID = "+serviceID);
final ServiceItem[] items = serviceDiscoveryManager.lookup(
new ServiceTemplate(//
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -37,6 +37,9 @@
import com.bigdata.service.jini.MetadataServer;
import com.bigdata.util.NV;
+//BTM
+import com.bigdata.metadata.EmbeddedShardLocator;
+
/**
* Configuration for the {@link MetadataServer}.
*
@@ -54,17 +57,27 @@
/**
* @param config
*/
- public MetadataServerConfiguration(Configuration config)
- throws ConfigurationException {
-
- super(MetadataServer.class, config);
-
+//BTM - BEGIN
+//BTM public MetadataServerConfiguration(Configuration config)
+//BTM throws ConfigurationException {
+//BTM
+//BTM super(MetadataServer.class, config);
+//BTM
+//BTM }
+ public MetadataServerConfiguration(Class classType,
+ Configuration config)
+ throws ConfigurationException
+ {
+ super(classType, config);
+System.out.println("*** MetadataServerConfiguration: constructor ***");
}
+//BTM - END
public MetadataServiceStarter newServiceStarter(JiniFederation fed,
IServiceListener listener, String zpath, Entry[] attributes)
throws Exception {
+System.out.println("*** MetadataServerConfiguration ---> newServiceStarter ***");
return new MetadataServiceStarter(fed, listener, zpath, attributes);
}
@@ -81,14 +94,27 @@
IServiceListener listener, String zpath, Entry[] attributes) {
super(fed, listener, zpath, attributes);
+System.out.println("*** MetadataServerConfiguration.MetadataServiceStarter: constructor ***");
}
@Override
protected NV getDataDir() {
- return new NV(MetadataServer.Options.DATA_DIR, serviceDir
- .toString());
+//BTM return new NV(MetadataServer.Options.DATA_DIR, serviceDir
+//BTM .toString());
+//BTM - BEGIN
+ // className field defined/set in ServiceConfiguration parent
+ if ( (MetadataServer.class.getName()).equals(className) ) {
+System.out.println("*** MetadataConfiguration.MetadataServiceStarter: getDataDir [MetadataServer.Options.DATA_DIR="+MetadataServer.Options.DATA_DIR+", serviceDir="+serviceDir.toString()+"] ***");
+ return new NV(MetadataServer.Options.DATA_DIR, serviceDir.toString());
+ } else if ( (com.bigdata.loadbalancer.ServiceImpl.class.getName()).equals(className) ) {
+System.out.println("*** MetadataConfiguration.MetadataServiceStarter: getDataDir [EmbeddedShardLocator.Options.DATA_DIR="+EmbeddedShardLocator.Options.DATA_DIR+", serviceDir="+serviceDir.toString()+"] ***");
+ return new NV(EmbeddedShardLocator.Options.DATA_DIR, serviceDir.toString());
+ } else {
+ return null;
+ }
+//BTM - END
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -223,45 +223,64 @@
// .getName(), config));
} else if (a.equals(QuorumPeerMain.class.getName())) {
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: QuorumPeerMain BEGIN");
-
v.add(new ZookeeperServerConfiguration(config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: QuorumPeerMain END\n");
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: QuorumPeerMain END\n");
} else if (a.equals(TransactionServer.class.getName())) {
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: TransactionServer BEGIN");
+ v.add(new TransactionServerConfiguration(TransactionServer.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: TransactionServer END\n");
- v.add(new TransactionServerConfiguration(config));
+ } else if (a.equals(MetadataServer.class.getName())) {
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: TransactionServer END\n");
- } else if (a.equals(MetadataServer.class.getName())) {
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: MetaDataServer BEGIN");
+ v.add(new MetadataServerConfiguration(MetadataServer.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: MetaDataServer END\n");
- v.add(new MetadataServerConfiguration(config));
+ } else if (a.equals(DataServer.class.getName())) {
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: MetaDataServer END\n");
- } else if (a.equals(DataServer.class.getName())) {
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: DataServer BEGIN");
-
v.add(new DataServerConfiguration(config));
-
System.out.println("*** ServicesManagerConfiguration.getConfigurations: DataServer END\n");
} else if (a.equals(LoadBalancerServer.class.getName())) {
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: LoadBalancerServer BEGIN");
v.add(new LoadBalancerConfiguration(LoadBalancerServer.class, config));
System.out.println("*** ServicesManagerConfiguration.getConfigurations: LoadBalancerServer END\n");
- } else if (a.equals(com.bigdata.loadbalancer.ServiceImpl.class.getName())) {
+
+ } else if (a.equals(ClientServer.class.getName())) {
+
+System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: ClientServer BEGIN");
+ v.add(new ClientServerConfiguration(config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: ClientServer END\n");
+
+
+//BTM - BEGIN: smart proxy impls ------------------------------------------------------------
+
+ } else if (a.equals(com.bigdata.transaction.ServiceImpl.class.getName())) {//transaction service
+
+System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: com.bigdata.transaction.ServiceImpl BEGIN");
+ v.add(new TransactionServerConfiguration(com.bigdata.transaction.ServiceImpl.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: com.bigdata.transaction.ServiceImpl END\n");
+
+ } else if (a.equals(com.bigdata.metadata.ServiceImpl.class.getName())) {//shard locator (metadata) service
+
+System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: com.bigdata.metadata.ServiceImpl BEGIN");
+ v.add(new MetadataServerConfiguration(com.bigdata.metadata.ServiceImpl.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: com.bigdata.metadata.ServiceImpl END\n");
+
+ } else if (a.equals(com.bigdata.loadbalancer.ServiceImpl.class.getName())) {//load balancer service
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: com.bigdata.loadbalancer.ServiceImpl BEGIN");
v.add(new LoadBalancerConfiguration(com.bigdata.loadbalancer.ServiceImpl.class, config));
System.out.println("*** ServicesManagerConfiguration.getConfigurations: com.bigdata.loadbalancer.ServiceImpl END\n");
- } else if (a.equals(ClientServer.class.getName())) {
-System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: ClientServer BEGIN");
+//BTM - END: smart proxy impls ------------------------------------------------------------
- v.add(new ClientServerConfiguration(config));
-
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: ClientServer END\n");
} else {
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: "+a+" BEGIN");
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -37,6 +37,9 @@
import com.bigdata.service.jini.TransactionServer;
import com.bigdata.util.NV;
+//BTM
+import com.bigdata.transaction.EmbeddedTransactionService;
+
/**
* Configuration for the {@link TransactionServer}.
*
@@ -54,17 +57,27 @@
/**
* @param config
*/
- public TransactionServerConfiguration(Configuration config)
- throws ConfigurationException {
-
- super(TransactionServer.class, config);
-
+//BTM - BEGIN
+//BTM public TransactionServerConfiguration(Configuration config)
+//BTM throws ConfigurationException {
+//BTM
+//BTM super(TransactionServer.class, config);
+//BTM
+//BTM }
+ public TransactionServerConfiguration(Class classType,
+ Configuration config)
+ throws ConfigurationException
+ {
+ super(classType, config);
+Sy...
[truncated message content] |
|
From: <sgo...@us...> - 2010-09-13 21:00:21
|
Revision: 3540
http://bigdata.svn.sourceforge.net/bigdata/?rev=3540&view=rev
Author: sgossard
Date: 2010-09-13 21:00:14 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
[merge dev-btm --> maven_scaleout] : Making certain merge of ^/branches/dev-btm reflects proper mergeinfo for revisions 3468:3470.
Property Changed:
----------------
branches/maven_scaleout/
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/
Property changes on: branches/maven_scaleout
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/test/java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/java:2594-3237
/branches/dev-btm/bigdata/src/test:3463
/branches/dev-btm/bigdata-core/src/test/java:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/test:3463
/branches/dev-btm/bigdata-rdf/src/test:3463
/branches/dev-btm/bigdata-sails/src/test:3463
/branches/fko/bigdata-core/src/test/java:3150-3194
/trunk/bigdata-core/src/test/java:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/java:2594-3237
/branches/dev-btm/bigdata/src/test:3463
/branches/dev-btm/bigdata-core/src/test/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test:3463
/branches/dev-btm/bigdata-rdf/src/test:3463
/branches/dev-btm/bigdata-sails/src/test:3463
/branches/fko/bigdata-core/src/test/java:3150-3194
/trunk/bigdata-core/src/test/java:3379-3430,3432-3460
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sgo...@us...> - 2010-09-14 17:20:05
|
Revision: 3544
http://bigdata.svn.sourceforge.net/bigdata/?rev=3544&view=rev
Author: sgossard
Date: 2010-09-14 17:19:56 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
[merge trunk --> maven_scaleout] : Merge of ^/trunk , revisions 3476:3542.
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFFileLoadTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/SingleResourceReaderTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/BasicRioLoader.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/IRioLoader.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/PresortRioLoader.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/store/DataLoader.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/Splitter.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/NicUtil.java
branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/AbstractRIOTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/EDSAsyncLoader.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/stress/LoadClosureAndQueryTest.java
Property Changed:
----------------
branches/maven_scaleout/
branches/maven_scaleout/bigdata-core/
branches/maven_scaleout/bigdata-core/bigdata-perf/
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/answers (U1)/
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/config/
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/logging/
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/scripts/
branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL/
branches/maven_scaleout/bigdata-core/dsi-utils/lib/
branches/maven_scaleout/bigdata-core/dsi-utils/src/
branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/bigdata-core/osgi/
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/main/java/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/
branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/
Property changes on: branches/maven_scaleout
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk:3499
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/bigdata-perf:3379-3430
+ /trunk/bigdata-perf:3379-3541
Modified: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java
===================================================================
--- branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/java/edu/lehigh/swat/bench/ubt/Test.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -85,7 +85,7 @@
hostname = NicUtil.getIpAddress("default.nic", "default", false);
} catch(Throwable t) {//for now, maintain same failure logic as used previously
t.printStackTrace();
- s = NicUtil.getIpAddressByLocalHost();
+ hostname = NicUtil.getIpAddressByLocalHost();
}
QUERY_TEST_RESULT_FILE = hostname + "-result.txt";
} else {
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/trunk/bigdata-perf/lubm/src/resources:3379-3430
+ /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/trunk/bigdata-perf/lubm/src/resources:3379-3541
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/answers (U1)
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1):2574-3440
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/config
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/dev-btm/bigdata-perf/lubm/src/resources/config:2574-3440
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/logging
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/dev-btm/bigdata-perf/lubm/src/resources/logging:2574-3440
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/scripts
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/dev-btm/bigdata-perf/lubm/src/resources/scripts:2574-3440
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dsi-utils/LEGAL:3379-3430
+ /trunk/dsi-utils/LEGAL:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dsi-utils/lib:3379-3430
+ /trunk/dsi-utils/lib:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dsi-utils/src:3379-3430
+ /trunk/dsi-utils/src:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430
+ /trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430
+ /trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/osgi
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/osgi:3379-3430
+ /trunk/osgi:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config 2010-09-14 17:19:56 UTC (rev 3544)
@@ -768,10 +768,11 @@
* have for your applications!
*/
"-Xmx1600m",// was 800
- /* Optionally, grab all/most of the max heap at once. This makes sense for
- * DS but is less necessary for other bigdata services.
+ /* Pre-allocation of the DS heap is no longer recommended.
+ *
+ * See https://sourceforge.net/apps/trac/bigdata/ticket/157
+ "-Xms800m",
*/
- "-Xms800m", // 1/2 of the max heap is a good value.
/*
* This option will keep the JVM "alive" even when it is memory starved
* but perform of a memory starved JVM is terrible.
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config 2010-09-14 17:19:56 UTC (rev 3544)
@@ -814,12 +814,11 @@
* http://blogs.msdn.com/ntdebugging/archive/2009/02/06/microsoft-windows-dynamic-cache-service.aspx
*/
"-Xmx9G", // Note: out of 32 available!
- /* Optionally, grab all/most of the max heap at once. This makes sense for
- * DS, but is less necessary for other bigdata services. If the machine is
- * dedicated to the DataService then use the maximum heap. Otherwise 1/2 of
- * the maximum heap is a good value.
- */
+ /* Pre-allocation of the DS heap is no longer recommended.
+ *
+ * See https://sourceforge.net/apps/trac/bigdata/ticket/157
"-Xms9G",
+ */
/*
* FIXME This might not be required, so that should be tested.
* However, you don't want the JVM to just die if it is being
@@ -1299,11 +1298,11 @@
static private namespace = "U"+univNum+"";
// minimum #of data services to run.
- static private minDataServices = bigdata.dataServiceCount;
+// static private minDataServices = bigdata.dataServiceCount; // unused
// How long the master will wait to discover the minimum #of data
// services that you specified (ms).
- static private awaitDataServicesTimeout = 8000;
+// static private awaitDataServicesTimeout = 8000; // unused.
/* Multiplier for the scatter effect.
*/
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config 2010-09-14 17:19:56 UTC (rev 3544)
@@ -783,10 +783,11 @@
* have for your applications!
*/
"-Xmx4g",// was 800
- /* Optionally, grab all/most of the max heap at once. This makes sense for
- * DS but is less necessary for other bigdata services.
+ /* Pre-allocation of the DS heap is no longer recommended.
+ *
+ * See https://sourceforge.net/apps/trac/bigdata/ticket/157
+ "-Xms2G",
*/
- "-Xms2G", // 1/2 of the max heap is a good value.
/*
* This option will keep the JVM "alive" even when it is memory starved
* but perform of a memory starved JVM is terrible.
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFDataLoadMaster.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -273,7 +273,18 @@
//
// /** {@value #DEFAULT_MAX_TRIES} */
// int DEFAULT_MAX_TRIES = 3;
-
+
+ /**
+ * The value that will be used for the graph/context co-ordinate when
+ * loading data represented in a triple format into a quad store.
+ */
+ String DEFAULT_GRAPH = "defaultGraph" ;
+
+ /**
+ * TODO Should we always enforce a real value? i.e. provide a real default
+ * or abort the load.
+ */
+ String DEFAULT_DEFAULT_GRAPH = null ;
}
/**
@@ -403,6 +414,12 @@
private transient RDFFormat rdfFormat;
/**
+ * The value that will be used for the graph/context co-ordinate when
+ * loading data represented in a triple format into a quad store.
+ */
+ public final String defaultGraph ;
+
+ /**
* Force the load of the NxParser integration class and its registration
* of the NQuadsParser#nquads RDFFormat.
*
@@ -497,6 +514,8 @@
sb.append(", " + ConfigurationOptions.RDF_FORMAT + "=" + rdfFormat);
+ sb.append(", " + ConfigurationOptions.DEFAULT_GRAPH + "=" + defaultGraph) ;
+
sb.append(", " + ConfigurationOptions.FORCE_OVERFLOW_BEFORE_CLOSURE + "="
+ forceOverflowBeforeClosure);
@@ -602,6 +621,10 @@
}
+ defaultGraph = (String) config.getEntry(component,
+ ConfigurationOptions.DEFAULT_GRAPH, String.class,
+ ConfigurationOptions.DEFAULT_DEFAULT_GRAPH);
+
rejectedExecutionDelay = (Long) config.getEntry(
component,
ConfigurationOptions.REJECTED_EXECUTION_DELAY, Long.TYPE,
@@ -983,6 +1006,7 @@
jobState.ontology,//file
jobState.ontology.getPath(),//baseURI
jobState.getRDFFormat(),//
+ jobState.defaultGraph,
jobState.ontologyFileFilter //
);
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFFileLoadTask.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFFileLoadTask.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/MappedRDFFileLoadTask.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -215,6 +215,7 @@
jobState.valuesInitialCapacity,//
jobState.bnodesInitialCapacity,//
jobState.getRDFFormat(), //
+ jobState.defaultGraph,
parserOptions,//
false, // deleteAfter is handled by the master!
jobState.parserPoolSize, //
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/SingleResourceReaderTask.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/SingleResourceReaderTask.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/load/SingleResourceReaderTask.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -186,7 +186,7 @@
// run the parser.
// @todo reuse the same underlying parser instance?
- loader.loadRdf(reader, baseURL, rdfFormat, parserOptions);
+ loader.loadRdf(reader, baseURL, rdfFormat, null, parserOptions);
success = true;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/AsynchronousStatementBufferFactory.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -356,8 +356,14 @@
* The default {@link RDFFormat}.
*/
private final RDFFormat defaultFormat;
-
+
/**
+ * The value that will be used for the graph/context co-ordinate when
+ * loading data represented in a triple format into a quad store.
+ */
+ private final String defaultGraph;
+
+ /**
* Options for the {@link RDFParser}.
*/
private final RDFParserOptions parserOptions;
@@ -1423,7 +1429,7 @@
try {
// run the parser.
new PresortRioLoader(buffer).loadRdf(reader, baseURL,
- rdfFormat, parserOptions);
+ rdfFormat, defaultGraph, parserOptions);
} finally {
reader.close();
}
@@ -1490,6 +1496,9 @@
* {@link BNode}s parsed from a single document.
* @param defaultFormat
* The default {@link RDFFormat} which will be assumed.
+ * @param defaultGraph
+ * The value that will be used for the graph/context co-ordinate when
+ * loading data represented in a triple format into a quad store.
* @param parserOptions
* Options for the {@link RDFParser}.
* @param deleteAfter
@@ -1529,6 +1538,7 @@
final int valuesInitialCapacity,//
final int bnodesInitialCapacity, //
final RDFFormat defaultFormat,//
+ final String defaultGraph,//
final RDFParserOptions parserOptions,//
final boolean deleteAfter,//
final int parserPoolSize,//
@@ -1566,6 +1576,8 @@
this.defaultFormat = defaultFormat;
+ this.defaultGraph = defaultGraph;
+
this.parserOptions = parserOptions;
this.deleteAfter = deleteAfter;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/BasicRioLoader.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/BasicRioLoader.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/BasicRioLoader.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -37,6 +37,8 @@
import org.openrdf.rio.RDFParser;
import org.openrdf.rio.Rio;
+import com.bigdata.rdf.model.BigdataURI;
+
/**
* Parses data but does not load it into the indices.
*
@@ -74,6 +76,8 @@
private final ValueFactory valueFactory;
+ protected String defaultGraph;
+
public BasicRioLoader(final ValueFactory valueFactory) {
if (valueFactory == null)
@@ -153,18 +157,20 @@
}
final public void loadRdf(final InputStream is, final String baseURI,
- final RDFFormat rdfFormat, final RDFParserOptions options)
+ final RDFFormat rdfFormat, final String defaultGraph,
+ final RDFParserOptions options)
throws Exception {
- loadRdf2(is, baseURI, rdfFormat, options);
+ loadRdf2(is, baseURI, rdfFormat, defaultGraph, options);
}
final public void loadRdf(final Reader reader, final String baseURI,
- final RDFFormat rdfFormat, final RDFParserOptions options)
+ final RDFFormat rdfFormat, final String defaultGraph,
+ final RDFParserOptions options)
throws Exception {
- loadRdf2(reader, baseURI, rdfFormat, options);
+ loadRdf2(reader, baseURI, rdfFormat, defaultGraph, options);
}
@@ -180,7 +186,7 @@
* @throws Exception
*/
protected void loadRdf2(final Object source, final String baseURI,
- final RDFFormat rdfFormat, final RDFParserOptions options)
+ final RDFFormat rdfFormat, final String defaultGraph, final RDFParserOptions options)
throws Exception {
if (source == null)
@@ -198,6 +204,8 @@
if (log.isInfoEnabled())
log.info("format=" + rdfFormat + ", options=" + options);
+ this.defaultGraph = defaultGraph ;
+
final RDFParser parser = getParser(rdfFormat);
// apply options to the parser
@@ -212,7 +220,7 @@
// Note: reset so that rates are correct for each source loaded.
stmtsAdded = 0;
-
+
try {
before();
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/IRioLoader.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/IRioLoader.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/IRioLoader.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -72,12 +72,14 @@
* The base URL for those data.
* @param rdfFormat
* The interchange format.
+ * @param defaultGraph
+ * The default graph.
* @param options
* Options to be applied to the {@link RDFParser}.
* @throws Exception
*/
public void loadRdf(Reader reader, String baseURL, RDFFormat rdfFormat,
- RDFParserOptions options) throws Exception;
+ String defaultGraph, RDFParserOptions options) throws Exception;
/**
* Parse RDF data.
@@ -88,11 +90,13 @@
* The base URL for those data.
* @param rdfFormat
* The interchange format.
+ * @param defaultGraph
+ * The default graph.
* @param options
* Options to be applied to the {@link RDFParser}.
* @throws Exception
*/
public void loadRdf(InputStream is, String baseURI, RDFFormat rdfFormat,
- RDFParserOptions options) throws Exception;
+ String defaultGraph, RDFParserOptions options) throws Exception;
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/PresortRioLoader.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/PresortRioLoader.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/rio/PresortRioLoader.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -23,11 +23,14 @@
*/
package com.bigdata.rdf.rio;
+import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.Value;
import org.openrdf.rio.RDFHandler;
import org.openrdf.rio.RDFHandlerException;
+import com.bigdata.rdf.model.BigdataURI;
+
/**
* Statement handler for the RIO RDF Parser that writes on a
* {@link StatementBuffer}.
@@ -45,6 +48,12 @@
final protected IStatementBuffer<?> buffer;
/**
+ * The value that will be used for the graph/context co-ordinate when
+ * loading data represented in a triple format into a quad store.
+ */
+ private BigdataURI defaultGraphURI = null ;
+
+ /**
* Sets up parser to load RDF.
*
* @param buffer
@@ -58,7 +67,7 @@
this.buffer = buffer;
}
-
+
/**
* bulk insert the buffered data into the store.
*/
@@ -87,8 +96,11 @@
public RDFHandler newRDFHandler() {
+ defaultGraphURI = null != defaultGraph && 4 == buffer.getDatabase ().getSPOKeyArity ()
+ ? buffer.getDatabase ().getValueFactory ().createURI ( defaultGraph )
+ : null
+ ;
return this;
-
}
public void handleStatement( final Statement stmt ) {
@@ -98,9 +110,13 @@
log.debug(stmt);
}
-
+
+ Resource graph = stmt.getContext() ;
+ if ( null == graph
+ && null != defaultGraphURI ) // only true when we know we are loading a quad store
+ graph = defaultGraphURI ;
// buffer the write (handles overflow).
- buffer.add( stmt.getSubject(), stmt.getPredicate(), stmt.getObject(), stmt.getContext() );
+ buffer.add( stmt.getSubject(), stmt.getPredicate(), stmt.getObject(), graph );
stmtsAdded++;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/store/DataLoader.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/store/DataLoader.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/store/DataLoader.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -642,7 +642,7 @@
final LoadStats totals = new LoadStats();
- loadData3(totals, reader, baseURL, rdfFormat, true/*endOfBatch*/);
+ loadData3(totals, reader, baseURL, rdfFormat, null, true/*endOfBatch*/);
return totals;
@@ -670,7 +670,7 @@
final LoadStats totals = new LoadStats();
- loadData3(totals, is, baseURL, rdfFormat, true/* endOfBatch */);
+ loadData3(totals, is, baseURL, rdfFormat, null, true/* endOfBatch */);
return totals;
@@ -706,7 +706,7 @@
final LoadStats totals = new LoadStats();
- loadData3(totals, is, baseURL, rdfFormat, true/*endOfBatch*/);
+ loadData3(totals, is, baseURL, rdfFormat, null, true/*endOfBatch*/);
return totals;
@@ -763,8 +763,8 @@
if(file.exists()) {
- loadFiles(totals, 0/* depth */, file.toURI().toURL(),
- baseURL, rdfFormat, filter, endOfBatch);
+ loadFiles(totals, 0/* depth */, file.toURI().toURL(), baseURL,
+ rdfFormat, null, filter, endOfBatch);
return;
@@ -792,7 +792,7 @@
try {
- loadData3(totals, reader, baseURL, rdfFormat, endOfBatch);
+ loadData3(totals, reader, baseURL, rdfFormat, null, endOfBatch);
} catch (Exception ex) {
@@ -818,6 +818,9 @@
* The format of the file (optional, when not specified the
* format is deduced for each file in turn using the
* {@link RDFFormat} static methods).
+ * @param defaultGraph
+ * The value that will be used for the graph/context co-ordinate when
+ * loading data represented in a triple format into a quad store.
* @param filter
* A filter selecting the file names that will be loaded
* (optional). When specified, the filter MUST accept directories
@@ -828,7 +831,8 @@
* @throws IOException
*/
public LoadStats loadFiles(final URL url, final String baseURI,
- final RDFFormat rdfFormat, final FilenameFilter filter)
+ final RDFFormat rdfFormat, final String defaultGraph,
+ final FilenameFilter filter)
throws IOException {
if (url == null)
@@ -836,8 +840,8 @@
final LoadStats totals = new LoadStats();
- loadFiles(totals, 0/* depth */, url, baseURI,
- rdfFormat, filter, true/* endOfBatch */);
+ loadFiles(totals, 0/* depth */, url, baseURI, rdfFormat, defaultGraph, filter, true/* endOfBatch */
+ );
return totals;
@@ -845,7 +849,8 @@
protected void loadFiles(final LoadStats totals, final int depth,
final URL url, final String baseURI, final RDFFormat rdfFormat,
- final FilenameFilter filter, final boolean endOfBatch)
+ final String defaultGraph, final FilenameFilter filter,
+ final boolean endOfBatch)
throws IOException {
// Legacy behavior - allow local files and directories for now,
@@ -870,8 +875,10 @@
final File f = files[i];
- loadFiles(totals, depth + 1, f.toURI().toURL(), baseURI,
- rdfFormat, filter,
+// final RDFFormat fmt = RDFFormat.forFileName(f.toString(),
+// rdfFormat);
+
+ loadFiles(totals, depth + 1, f.toURI().toURL(), baseURI, rdfFormat, defaultGraph, filter,
(depth == 0 && i < files.length ? false : endOfBatch));
}
@@ -915,7 +922,7 @@
final String s = baseURI != null ? baseURI : url.toURI()
.toString();
- loadData3(totals, reader, s, rdfFormat, endOfBatch);
+ loadData3(totals, reader, s, rdfFormat, defaultGraph, endOfBatch);
return;
@@ -947,7 +954,7 @@
*/
protected void loadData3(final LoadStats totals, final Object source,
final String baseURL, final RDFFormat rdfFormat,
- final boolean endOfBatch) throws IOException {
+ final String defaultGraph, final boolean endOfBatch) throws IOException {
final long begin = System.currentTimeMillis();
@@ -970,11 +977,10 @@
}
// Setup the loader.
- final PresortRioLoader loader = new PresortRioLoader(buffer);
+ final PresortRioLoader loader = new PresortRioLoader ( buffer ) ;
// @todo review: disable auto-flush - caller will handle flush of the buffer.
// loader.setFlush(false);
-
// add listener to log progress.
loader.addRioLoaderListener( new RioLoaderListener() {
@@ -998,12 +1004,12 @@
if(source instanceof Reader) {
- loader.loadRdf((Reader) source, baseURL, rdfFormat, parserOptions);
+ loader.loadRdf((Reader) source, baseURL, rdfFormat, defaultGraph, parserOptions);
} else if (source instanceof InputStream) {
loader.loadRdf((InputStream) source, baseURL, rdfFormat,
- parserOptions);
+ defaultGraph, parserOptions);
} else
throw new AssertionError();
@@ -1351,9 +1357,8 @@
// dataLoader.loadFiles(fileOrDir, null/* baseURI */,
// rdfFormat, filter);
- dataLoader.loadFiles(totals, 0/* depth */,
- fileOrDir.toURI().toURL(), baseURI,
- rdfFormat, filter, true/* endOfBatch */
+ dataLoader.loadFiles(totals, 0/* depth */, fileOrDir.toURI().toURL(), baseURI,
+ rdfFormat, null, filter, true/* endOfBatch */
);
}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430
+ /branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/Splitter.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/Splitter.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/Splitter.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -714,7 +714,7 @@
try {
// run the parser.
new MyLoader(buffer).loadRdf(reader, baseURL,
- defaultRDFFormat, s.parserOptions);
+ defaultRDFFormat, null, s.parserOptions);
} finally {
reader.close();
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/NicUtil.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/NicUtil.java 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/NicUtil.java 2010-09-14 17:19:56 UTC (rev 3544)
@@ -26,28 +26,20 @@
package com.bigdata.util.config;
import java.io.IOException;
-import java.net.InetAddress;
import java.net.Inet4Address;
+import java.net.InetAddress;
import java.net.InterfaceAddress;
-import java.net.MalformedURLException;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Enumeration;
-import java.util.Collections;
-import java.util.logging.LogRecord;
import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import net.jini.config.Configuration;
-import net.jini.config.ConfigurationException;
-import com.sun.jini.config.Config;
-import com.sun.jini.logging.Levels;
-
/**
* Utility class that provides a set of static convenience methods
* related to processing information about the current node's Network
@@ -400,34 +392,34 @@
return macAddr;
}
- /**
- * Three-argument version of <code>getInetAddress</code> that retrieves
- * the desired interface name from the given <code>Configuration</code>
- * parameter.
- */
- public static InetAddress getInetAddress(Configuration config,
- String componentName,
- String nicNameEntry)
- {
- String nicName = "NoNetworkInterfaceName";
- try {
- nicName = (String)Config.getNonNullEntry(config,
- componentName,
- nicNameEntry,
- String.class,
- "eth0");
- } catch(ConfigurationException e) {
- jiniConfigLogger.log(WARNING, e
- +" - [componentName="+componentName
- +", nicNameEntry="+nicNameEntry+"]");
- utilLogger.log(Level.WARN, e
- +" - [componentName="+componentName
- +", nicNameEntry="+nicNameEntry+"]");
- e.printStackTrace();
- return null;
- }
- return ( getInetAddress(nicName, 0, null, false) );
- }
+// /**
+// * Three-argument version of <code>getInetAddress</code> that retrieves
+// * the desired interface name from the given <code>Configuration</code>
+// * parameter.
+// */
+// public static InetAddress getInetAddress(Configuration config,
+// String componentName,
+// String nicNameEntry)
+// {
+// String nicName = "NoNetworkInterfaceName";
+// try {
+// nicName = (String)Config.getNonNullEntry(config,
+// componentName,
+// nicNameEntry,
+// String.class,
+// "eth0");
+// } catch(ConfigurationException e) {
+// jiniConfigLogger.log(WARNING, e
+// +" - [componentName="+componentName
+// +", nicNameEntry="+nicNameEntry+"]");
+// utilLogger.log(Level.WARN, e
+// +" - [componentName="+componentName
+// +", nicNameEntry="+nicNameEntry+"]");
+// e.printStackTrace();
+// return null;
+// }
+// return ( getInetAddress(nicName, 0, null, false) );
+// }
// What follows are a number of versions of the getIpAddress method
// provided for convenience.
Modified: branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties 2010-09-14 14:46:01 UTC (rev 3543)
+++ branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties 2010-09-14 17:19:56 UTC (rev 3544)
@@ -1,7 +1,8 @@
-# Be very careful when you use this configuration! This turns off incremental
-# inference for load and retract, so you must explicitly force these operations,
-# which requires punching through the SAIL layer. Of course, if you are not
-# using inference then this is just the ticket and quite fast.
+# This configuration turns off incremental inference for load and retract, so
+# you must explicitly force these operations if you want to compute the closure
+# of the knowledge base. Forcing the closure requires punching through the SAIL
+# layer. Of course, if you are not using inference then this configuration is
+# just the ticket and is quite fast.
# set the initial and maximum extent of the journal
com.bigdata.journal.AbstractJournal.initialExtent=209715200
Property changes on: branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/bigdata-sails/src/samples/com/bigdata/samples/fastload.properties:3503
/trunk/src/samples-sail/com/bigdata/samples/fastload.properties:3499
Property changes on: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3150-3194
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testf...
[truncated message content] |
|
From: <fko...@us...> - 2010-09-28 19:25:55
|
Revision: 3670
http://bigdata.svn.sourceforge.net/bigdata/?rev=3670&view=rev
Author: fkoliver
Date: 2010-09-28 19:25:42 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Upgrade junit tests to junit4.8.1.
Remove references to junit3 except for Sparql tests (because of
interactions with openrdf tests).
Replace TestSuite instances with @RunWith(Suite.class) suites.
Remove references to cweb-junit.
- Replace proxy/delegate extensions with junit4 parameterized tests.
- Reimplement methods from TestCase2 where necessary
(in com.bigdata.test.Assert).
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/pom.xml
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/btree/raba/codec/AbstractRabaCoderTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/TestDataFinder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/AbstractRepositoryTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestAppendBlock.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestCopyStream.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestFileMetadataIndex.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestFileVersionOutputStream.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestRandomBlockOps.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestRangeDelete.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/bfs/TestRangeScan.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/boot/BootComponentTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/boot/launcher/ConfigReaderUnitTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/AbstractBTreeCursorTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/AbstractBTreeTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/AbstractIndexSegmentTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/AbstractTupleCursorTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/MyEvictionListener.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestAll_BTreeBasics.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestAll_IndexSegment.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestAll_Iterators.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBTree.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBTreeLeafCursors.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBTreeWithBloomFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBigdataMap.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBigdataSet.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestBloomFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestChunkedIterators.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestCommit.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestCompactingByteArrayBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestConstrainKeys.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestCopyOnWrite.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestDeleteMarkers.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestDirtyIterators.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestDirtyListener.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestFindChild.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIncrementalWrite.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexCounter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexPartitionFencePosts.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegment.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentAddressManager.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithCompactingMerge.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithIncrementalBuild.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithLargeTrees.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithSmallTree.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentCheckpoint.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentCursors.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentMultiBlockIterators.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentPlan.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentWithBloomFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestInsertLookupRemoveKeysInRootLeaf.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIterators.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestLeafSplitShortestSeparatorKey.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestLinearListMethods.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestMutableBTreeCursors.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestNullValues.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestReadOnlyBTreeCursors.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestRemoveAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestReopen.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestSplitJoinRootLeaf.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestSplitJoinThreeLevels.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestSplitRootLeaf.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestTouch.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestTransientBTree.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestUtilMethods.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/AbstractLeafDataRecordTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/AbstractNodeDataRecordTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/AbstractNodeOrLeafDataRecordTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/TestLeafDataRecord_CanonicalHuffman_CanonicalHuffman.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/TestLeafDataRecord_FrontCoded_CanonicalHuffman.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/TestLeafDataRecord_Simple_Simple.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/TestNodeDataRecord_CanonicalHuffman.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/TestNodeDataRecord_FrontCoded.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/data/TestNodeDataRecord_Simple.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/filter/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/filter/TestPrefixFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/filter/TestRemoverator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/filter/TestReverserator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/filter/TestTupleFilters.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/isolation/TestAccount.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/isolation/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/isolation/TestConflictResolution.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/isolation/TestIsolatedFusedView.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/isolation/TestMixedModeOperations.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/keys/AbstractUnicodeKeyBuilderTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/keys/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/keys/TestICUUnicodeKeyBuilder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/keys/TestJDKUnicodeKeyBuilder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/keys/TestKeyBuilder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/keys/TestSuccessorUtil.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/proc/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/AbstractKeyBufferTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/TestKeyBufferSearch.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/TestMutableKeyBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/TestMutableValuesRaba.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/AbstractFrontCodedRabaCoderTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/AbstractRabaCoderTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestCanonicalHuffmanRabaCoder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestConditionalRabaCoder_keys_simple_frontCoded.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestConditionalRabaCoder_values_simple_canonical.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestEmptyRabaCoder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestFixedLengthValueRabaCoder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestFrontCodedRabaCoderRatio2.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestFrontCodedRabaCoderRatio32.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestFrontCodedRabaCoderRatio8.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/raba/codec/TestSimpleRabaCoder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/view/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/view/TestFusedView.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/AbstractCachePolicyTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/AbstractHardReferenceGlobalLRUTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/StressTestGlobalLRU.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithStripedLocks.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithStripedLocksAndLIRS.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithThreadLocalBuffers.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithThreadLocalBuffersAndLIRS.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRUWithLIRS.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestHardReferenceGlobalLRU.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestHardReferenceGlobalLRURecycler.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestHardReferenceGlobalLRURecyclerExplicitDeleteRequired.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestHardReferenceQueue.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestHardReferenceQueueWithBatchingUpdates.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestLRUCache.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestRingBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestStoreAndAddressLRUCache.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestWeakValueCache.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/AbstractStressTestNonBlockingLockManager.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/StressTestNonBlockingLockManagerWithPredeclaredLocks.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/StressTestNonBlockingLockManagerWithTxDag.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/TestLockManager.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/TestNonBlockingLockManager.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/TestNonBlockingLockManagerWithNewDesign.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/concurrent/TestTxDag.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/config/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/config/TestConfiguration.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/TestCounters.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/TestHistoryInstrument.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/httpd/TestCounterSetHTTPDServer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/linux/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/linux/TestKernelVersion.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/linux/TestParsing.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/query/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/query/TestTimeRange.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/store/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/counters/store/TestCounterSetBTree.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestAll_Buffers.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestByteArrayBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestByteBufferStreams.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestBytesUtil.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestChecksumUtility.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestDataOutputBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestDirectBufferPool.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestFileChannelUtility.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestFileLockUtility.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestFixedByteArrayBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestIO.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestLongPacker.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestManagedReads.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestNameAndExtensionFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestShortPacker.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestWriteCache.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/TestWriteCacheService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/compression/AbstractRecordCompressorTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/compression/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/compression/TestHuffmanEncoder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/compression/TestNOPRecordCompressor.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/compression/TestRecordCompressor_BestCompression.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/io/compression/TestRecordCompressor_BestSpeed.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractBufferStrategyTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractCommitRecordTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractIndexManagerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractInterruptsTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractJournalTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractMRMWTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractMROWTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/AbstractRestartSafeTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/BenchmarkJournalWriteRate.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/ProxyTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/StressTestConcurrentTx.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/StressTestConcurrentUnisolatedIndices.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/StressTestGroupCommit.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/StressTestLockContention.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestAbort.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestAddDropIndexTask.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestCommitHistory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestCommitList.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestCommitRecordIndex.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestCommitRecordSerializer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestCompactJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestConcurrentJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestDirectJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestDiskJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestDoubleOpen.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestJournalBasics.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestMappedJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestName2Addr.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestNamedIndices.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestRandomAccessFileSynchronousWrites.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestReadCommittedTx.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestReadOnlyTx.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestRestartSafe.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestRollbackCommit.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestRootBlockView.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestRunState.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTemporaryStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransactionSupport.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransientJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTx.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestUnisolatedWriteTasks.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestWORMStrategy.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/mdi/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/net/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/net/TestInetAddressUtil.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/nio/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/nio/TestPageServer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/process/ProcessConfigXmlHandlerTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/AbstractRawStoreTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/TestSimpleFileRawStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/TestSimpleMemoryRawStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rawstore/TestWormAddressManager.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/axioms/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/axioms/TestAxioms.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/BlobOverflowHandler.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/ITermIdCodes.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/TestIVCompare.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/TestLongLiterals.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/constraints/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/internal/constraints/TestInlineConstraints.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestAddTerms.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestComparators.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestCompletionScan.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestFullTextIndex.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestId2TermTupleSerializer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestInlining.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestSerialization.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestTerm2IdTupleSerializer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestTermIdEncoder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/lexicon/TestVocabulary.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/load/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/load/TestLockDeserialization.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/magic/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/magic/TestIRIS.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/magic/TestMagicKeyOrderStrategy.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/magic/TestMagicStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/metrics/AbstractMetricsTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/metrics/MetricsQueryParser.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/metrics/TaskATest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/metrics/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/metrics/TestMetrics.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/metrics/TestQueryReader.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/model/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/model/TestFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/AbstractRIOTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/EDSAsyncLoader.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestAsynchronousStatementBufferFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestLoadAndVerify.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestRDFXMLInterchangeWithStatementIdentifiers.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rio/TestStatementBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/AbstractInferenceEngineTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/AbstractRuleTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestBackchainOwlSameAsPropertiesIterator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestBackchainTypeResourceIterator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestCompareFullAndFastClosure.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDistinct.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestDistinctTermScan.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestJustifications.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestMappedProgram.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestMatch.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestModelsEqual.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestOptionals.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestOrderBy.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestOwlSameAsPropertiesExpandingIterator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleExpansion.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_11_13.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleFastClosure_3_5_6_7_9.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentClass.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleOwlEquivalentProperty.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleOwlHasValue.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleOwlInverseOf.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleOwlSameAs.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleOwlTransitiveProperty.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleRdf01.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs03.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs04.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs07.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs10.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestRuleRdfs11.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestSlice.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestTMUtility.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestTruthMaintenance.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestUnion.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/AbstractBigdataSailTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/ProxyBigdataSailTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/QuadsTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBigdataSailEvaluationStrategyImpl.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoins.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithQuadsAndPipelineJoinsWithoutInlining.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithSids.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithSidsWithoutInlining.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestBootstrapBigdataSail.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestDescribe.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestInlineValues.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestJoinScope.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestNamedGraphs.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestOptionals.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestOrderBy.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestProvenanceQuery.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestPruneBindingSets.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestQuadsAPI.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestQuery.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestQueryHints.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestReadWriteTransactions.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestSearchQuery.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestSetBinding.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestSids.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/TestUnions.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlTest2.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataStoreTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestDefaultGraphAccessPath.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPO.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPOAccessPath.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPOKeyCoders.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPOKeyOrder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPOPredicate.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPORelation.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPOStarJoin.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPOTupleSerializer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestSPOValueCoders.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/spo/TestStatementEnum.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractDistributedBigdataFederationTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractDistributedTripleStoreTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractEmbeddedBigdataFederationTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractEmbeddedTripleStoreTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractServerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractTripleStoreTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/ProxyTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/StressTestCentos.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestBulkFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestInsertRate.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestIsModified.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestLocalQuadStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestLocalTripleStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreWithoutInlining.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreWithoutStatementIdentifiers.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestRelationLocator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestRestartSafe.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestScaleOutTripleStoreWithEmbeddedFederation.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestScaleOutTripleStoreWithJiniFederation.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestStatementIdentifiers.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestTempTripleStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestTripleStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestTripleStoreBasics.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestArrayBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestBlockingBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestBlockingBufferWithChunks.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestBlockingBufferWithChunksDeque.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestSameVariableConstraint.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestThickAsynchronousIterator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestUnsynchronizedArrayBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/accesspath/TestUnsynchronizedUnboundedChunkBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/ddl/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/locator/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/locator/TestDefaultResourceLocator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/AbstractRuleTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestBindingSet.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestConstant.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestPredicate.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestProgram.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestRule.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestSlice.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/TestVar.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/eval/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/eval/TestDefaultEvaluationPlan.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/relation/rule/eval/TestRuleState.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerBootstrapTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestAddDeleteResource.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestBuildTask.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestBuildTask2.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestMergeTask.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestOverflow.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResources.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestResourceManagerBootstrap.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestSegSplitter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rwstore/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rwstore/TestRWJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/search/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/search/TestKeyBuilder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/search/TestPrefixSearch.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/search/TestSearch.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/search/TestSearchRestartSafe.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/AbstractEmbeddedFederationTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/StressTestConcurrent.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/StressTestConcurrentRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestBasicIndexStuff.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestBasicIndexStuffRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestClientException.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestDistributedTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestDistributedTransactionServiceRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestDistributedTransactionServiceRestart.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEDS.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEDSRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEmbeddedClient.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEmbeddedClientRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEventParser.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEventReceiver.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestJournal.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestLoadBalancerRoundRobin.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMetadataIndex.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMetadataIndexRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMove.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMoveRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestOverflow.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestOverflowRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestRangeQuery.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestRangeQueryRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestResourceService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestRestartSafe.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestRestartSafeRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestScatterSplit.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestScatterSplitRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestSnapshotHelper.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestSplitJoin.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestSplitJoinRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/jini/master/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/jini/master/TestMappedRDFDataLoadMasterRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/TestSplitter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/AbstractKeyRangeMasterTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/AbstractMasterTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestDefaultDuplicateRemover.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestFileSystemScanner.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTask.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTaskIdleTimeout.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTaskWithErrors.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/sparse/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/sparse/TestKeyEncodeDecode.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/sparse/TestSparseRowStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/sparse/TestTPS.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/sparse/TestValueType.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/striterator/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/striterator/TestChunkedFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/striterator/TestDistinctFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/striterator/TestMergeFilter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/striterator/TestPushbackIterator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/striterator/TestResolver.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/test/ExperimentDriver.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestByteBufferBitVector.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestCSVReader.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestHybridTimestampFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestInnerCause.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestMillisecondTimestampFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestNanosecondTimestampFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/concurrent/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/concurrent/TestLatch.java
branches/maven_scaleout/bigdata-core/src/test/java/org/apache/system/TestSystemUtil.java
branches/maven_scaleout/bigdata-core/src/test/java/org/openrdf/query/parser/sparql/SPARQLQueryTest.java
branches/maven_scaleout/bigdata-integ/pom.xml
branches/maven_scaleout/pom.xml
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestDirectJournalInterrupts.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestDirectJournalMRMW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestDirectJournalMROW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestDirectJournalRawStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTemporaryStoreInterrupts.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTemporaryStoreMRMW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTemporaryStoreMROW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTemporaryStoreRawStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransientJournalMRMW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransientJournalMROW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransientJournalRawStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestWORMStrategyInterrupts.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestWORMStrategyMRMW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestWORMStrategyMROW.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestWORMStrategyRawStore.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataConnectionTestLTSWithNestedSubquery.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataConnectionTestLTSWithPipelineJoins.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataSparqlSuite.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataStoreTestLTSWithNestedSubquery.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/sail/tck/BigdataStoreTestLTSWithPipelineJoins.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResourcesWithCopyImmediateRelease.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResourcesWithCopyNoRelease.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestReleaseResourcesWithCopy_NonZeroMinReleaseAge.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/test/Assert.java
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-09-28 18:32:10 UTC (rev 3669)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-09-28 19:25:42 UTC (rev 3670)
@@ -213,12 +213,6 @@
</dependency>
<dependency>
<groupId>${thirdParty.groupId}</groupId>
- <artifactId>cweb-junit-ext</artifactId>
- <version>1.1.0-b3-dev</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${thirdParty.groupId}</groupId>
<artifactId>cweb-commons</artifactId>
<version>1.1.0-b2-dev</version>
</dependency>
Modified: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/btree/raba/codec/AbstractRabaCoderTestCase.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/btree/raba/codec/AbstractRabaCoderTestCase.java 2010-09-28 18:32:10 UTC (rev 3669)
+++ branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/btree/raba/codec/AbstractRabaCoderTestCase.java 2010-09-28 19:25:42 UTC (rev 3670)
@@ -39,10 +39,6 @@
import java.util.Random;
import java.util.concurrent.TimeUnit;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-import junit.framework.TestCase2;
-
import com.bigdata.btree.AbstractBTreeTestCase;
import com.bigdata.io.BytesUtil;
import com.bigdata.io.BytesUtil.UnsignedByteArrayComparator;
@@ -58,7 +54,7 @@
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
*/
-abstract public class AbstractRabaCoderTestCase extends TestCase2 {
+abstract public class AbstractRabaCoderTestCase extends Assert {
/**
*
@@ -94,6 +90,7 @@
/**
* A simple unit test.
*/
+ @Test
public void test_mike_personick() throws UnsupportedEncodingException {
if(isFixedLength()) return;
@@ -148,6 +145,7 @@
* Test with byte values which are negative values when interpreted as as
* signed 8 bit integers.
*/
+ @Test
public void test_negativeByteValues() throws UnsupportedEncodingException {
if(isFixedLength()) return;
@@ -175,6 +173,7 @@
*
* @throws UnsupportedEncodingException
*/
+ @Test
public void test_emptyElement() throws UnsupportedEncodingException {
if(isFixedLength()) return;
@@ -204,6 +203,7 @@
* {@link CanonicalFast64CodeWordDecoder}. A workaround for that bug has
* been implemented in the {@link CanonicalHuffmanRabaCoder}.
*/
+ @Test
public void test_nsymbolsOne() {
if(isFixedLength()) return;
@@ -231,6 +231,7 @@
* {@link CanonicalFast64CodeWordDecoder}. A workaround for that bug has
* been implemented in the {@link CanonicalHuffmanRabaCoder}.
*/
+ @Test
public void test_nsymbolsOne_nulls() {
if(isFixedLength()) return;
@@ -253,6 +254,7 @@
*
* @throws UnsupportedEncodingException
*/
+ @Test
public void test_withNulls() throws UnsupportedEncodingException {
if (!rabaCoder.isValueCoder()) {
@@ -283,6 +285,7 @@
* parameterized to identify the <code>null</code>s or else just fix the
* ctor.
*/
+ @Test
public void test_withNulls2() {
if (!rabaCoder.isValueCoder()) {
@@ -304,6 +307,7 @@
final Random r = new Random();
+ @Test
public void test_empty() throws IOException {
doRandomRoundTripTest(rabaCoder, 0/* size */, 0/*capacity*/);
@@ -320,6 +324,7 @@
* Test with {@link IRaba} having a size of ONE (1) and a variety of
* capacities.
*/
+ @Test
public void test_entryCount1() throws IOException {
doRandomRoundTripTest(rabaCoder, 1/* n */, 1/* capacity */);
@@ -334,6 +339,7 @@
* Test with {@link IRaba} having a size of TWO (2) and a variety of
* capacities.
*/
+ @Test
public void test_entryCount2() throws IOException {
doRandomRoundTripTest(rabaCoder, 2/* n */, 2/* capacity */);
@@ -347,6 +353,7 @@
/**
* This test case was developed for the {@link FrontCodedRabaCoder}.
*/
+ @Test
public void test_error1() throws IOException {
if(isFixedLength()) return;
@@ -422,6 +429,7 @@
* at com.bigdata.btree.raba.codec.AbstractRabaCoderTestCase.test_error2(AbstractRabaCoderTestCase.java:325)
* </pre>
*/
+ @Test
public void test_error2() {
if(isFixedLength()) return;
@@ -443,6 +451,7 @@
}
}
+ @Test
public void test_randomOnce() throws IOException {
// #of elements.
@@ -455,6 +464,7 @@
}
+ @Test
public void testStress() throws IOException {
for (int i = 0; i < 1000; i++) {
@@ -476,6 +486,7 @@
*
* @throws Exception
*/
+ @Test
public void test_randomURIs() throws Exception {
if(isFixedLength()) return;
@@ -730,7 +741,7 @@
expected, out);
// verify same encoded data for the slice.
- assertEquals(originalData.toByteArray(), slice.toByteArray());
+ assertArrayEquals(originalData.toByteArray(), slice.toByteArray());
}
@@ -748,7 +759,7 @@
tmp, off, originalData.len());
// verify same slice.
- assertEquals(originalData.toByteArray(), slice.toByteArray());
+ assertArrayEquals(originalData.toByteArray(), slice.toByteArray());
// decode the slice.
final IRaba actual = rabaCoder.decode(slice);
@@ -899,6 +910,7 @@
* A test designed to measure the performance of an {@link IRabaCoder} for
* operations on B+Tree keys, including search.
*/
+ @Test
public void test_keyCoderPerformance() {
// test is only for coders which can code keys.
@@ -1385,10 +1397,11 @@
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
* @version $Id$
*/
- public static class TestOp extends TestCase {
+ public static class TestOp
private final Random r = new Random();
+ @Test
public void test_Op() {
/*
* isNull, length, get, copy, search, iterator, recode.
@@ -1397,6 +1410,7 @@
doOpTest(gen);
}
+ @Test
...
[truncated message content] |
|
From: <sgo...@us...> - 2010-10-01 15:01:26
|
Revision: 3711
http://bigdata.svn.sourceforge.net/bigdata/?rev=3711&view=rev
Author: sgossard
Date: 2010-10-01 15:01:16 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
[maven_scaleout] : Broke all direct dependency cycles with package 'com.bigdata.mdi'. Wound up moving IMetadataIndex, LocalPartitionMetadata and JournalMetadata related classes to 'com.bigdata.btree'. This is likely a temporary move until the cycles between the btree and journal packages can be sorted out. These classes were Externalizable, so this change is not backwards compatible with existing installs. Also moved/renamed 'com.bigdata.service.Params' to 'com.bigdata.event.IEventParams'.
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/BTree.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentBuilder.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyAfterPartitionException.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyBeforePartitionException.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/ViewStatistics.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/proc/RangeCountProcedure.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/view/FusedView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractJournal.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/Name2Addr.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/RegisterIndexTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/AbstractResourceMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/IPartitionMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/IndexPartitionCause.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/PartitionLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/SegmentMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedIndexStore.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedShardLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/relation/accesspath/AbstractAccessPath.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/relation/rule/eval/IJoinNexus.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/AsynchronousOverflowTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/BTreeMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/BuildResult.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/CompactingMergeTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/IncrementalBuildTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/IndexManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/JoinIndexPartitionTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/JournalIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/MoveTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/OverflowManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/PurgeResult.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/ResourceManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/ScatterSplitTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/SplitIndexPartitionTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/SplitResult.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/SplitUtility.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/ViewMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractScaleOutClient.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractScaleOutFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/CacheOnceMetadataIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/CachingMetadataIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/EventResource.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IBigdataFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IDataService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IMetadataService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/MetadataIndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/MetadataService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/NoCacheMetadataIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ShardLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ShardManagement.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/util/DumpFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView2.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractSplitter.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/ClientIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/ClientIndexViewRefactor.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/IScaleOutClientIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/ISplitter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/btree/TestIndexPartitionFencePosts.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractServerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestBuildTask.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestBuildTask2.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestMergeTask.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestOverflow.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestResourceManagerBootstrap.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/TestSegSplitter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/AbstractEmbeddedFederationTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEmbeddedClient.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEventReceiver.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMetadataIndex.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMove.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestOverflow.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestScatterSplit.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestSplitJoin.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/TestSplitter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/AbstractKeyRangeMasterTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
branches/maven_scaleout/bigdata-integ/src/test/java/com/bigdata/service/jini/AbstractServerTestCase.java
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IMetadataIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/JournalMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/LocalPartitionMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/MetadataIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/MetadataIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/event/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/event/IEventParams.java
Removed Paths:
-------------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/IMetadataIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/JournalMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/LocalPartitionMetadata.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/MetadataIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/MetadataIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/Params.java
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/bfs/BigdataFileSystem.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -34,7 +34,7 @@
import com.bigdata.journal.IResourceLock;
import com.bigdata.journal.ITx;
import com.bigdata.journal.Journal;
-import com.bigdata.mdi.MetadataIndex;
+import com.bigdata.btree.MetadataIndex;
import com.bigdata.rawstore.Bytes;
import com.bigdata.rawstore.IBlock;
import com.bigdata.rawstore.WormAddressManager;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -81,7 +81,6 @@
import com.bigdata.journal.IIndexManager;
import com.bigdata.journal.Journal;
import com.bigdata.mdi.IResourceMetadata;
-import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.rawstore.IRawStore;
import com.bigdata.resources.IndexManager;
import com.bigdata.resources.OverflowManager;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTreeTupleCursor.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -37,7 +37,6 @@
import com.bigdata.btree.isolation.IsolatedFusedView;
import com.bigdata.btree.view.FusedView;
import com.bigdata.io.DataOutputBuffer;
-import com.bigdata.mdi.LocalPartitionMetadata;
/**
* Class supporting random access to tuples and sequential tuple-based cursor
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/BTree.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/BTree.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/BTree.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -41,8 +41,6 @@
import com.bigdata.journal.Name2Addr;
import com.bigdata.journal.Name2Addr.Entry;
import com.bigdata.mdi.IResourceMetadata;
-import com.bigdata.mdi.JournalMetadata;
-import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.rawstore.IRawStore;
/**
Copied: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IMetadataIndex.java (from rev 3704, branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/IMetadataIndex.java)
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IMetadataIndex.java (rev 0)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IMetadataIndex.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -0,0 +1,95 @@
+/*
+
+Copyright (C) SYSTAP, LLC 2006-2008. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+/*
+ * Created on Feb 11, 2008
+ */
+
+package com.bigdata.btree;
+
+import com.bigdata.btree.MetadataIndex.MetadataIndexMetadata;
+import com.bigdata.mdi.PartitionLocator;
+import com.bigdata.service.IDataService;
+
+/**
+ * Interface for a metadata index. The metadata index stores the
+ * {@link com.bigdata.mdi.PartitionLocator}s that specify which {@link IDataService} has data
+ * for each index partition in a scale-out index.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public interface IMetadataIndex extends IRangeQuery { //extends IIndex {
+
+ /**
+ * The metadata for the metadata index itself. Note that the
+ * {@link MetadataIndexMetadata#getManagedIndexMetadata()} returns the
+ * template {@link IndexMetadata} for the scale-out index partitions.
+ *
+ * @see #getScaleOutIndexMetadata()
+ */
+ public MetadataIndexMetadata getIndexMetadata();
+
+ /**
+ * The metadata template for the scale-out index managed by this metadata
+ * index.
+ */
+ public IndexMetadata getScaleOutIndexMetadata();
+
+ /**
+ * The partition with that separator key or <code>null</code> (exact match
+ * on the separator key).
+ *
+ * @param key
+ * The separator key (the first key that would go into that
+ * partition).
+ *
+ * @return The partition with that separator key or <code>null</code>.
+ */
+ public PartitionLocator get(byte[] key);
+
+ /**
+ * Find and return the partition spanning the given key.
+ *
+ * @param key
+ * A key (optional). When <code>null</code> the locator for the
+ * last index partition will be returned.
+ *
+ * @return The partition spanning the given key or <code>null</code> if
+ * there are no partitions defined.
+ */
+ public PartitionLocator find(byte[] key);
+
+ /**
+ * Notification that a locator is stale. Caching implementations of this
+ * interface will use this notice to update their state from the
+ * authoritative metadata index. Non-caching and authoritative
+ * implementations just ignore this message.
+ *
+ * @param locator
+ * The locator.
+ */
+ public void staleLocator(PartitionLocator locator);
+
+}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IMetadataIndex.java
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
Added: svn:eol-style
+ native
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexMetadata.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexMetadata.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexMetadata.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -57,8 +57,6 @@
import com.bigdata.io.SerializerUtil;
import com.bigdata.io.compression.IRecordCompressorFactory;
import com.bigdata.journal.IIndexManager;
-import com.bigdata.mdi.LocalPartitionMetadata;
-import com.bigdata.mdi.MetadataIndex;
import com.bigdata.rawstore.IRawStore;
import com.bigdata.relation.accesspath.IAsynchronousIterator;
import com.bigdata.resources.OverflowManager;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentBuilder.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentBuilder.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentBuilder.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -52,12 +52,10 @@
import com.bigdata.btree.raba.MutableKeyBuffer;
import com.bigdata.btree.raba.MutableValueBuffer;
import com.bigdata.btree.view.FusedView;
-import com.bigdata.cache.IGlobalLRU.ILRUCache;
import com.bigdata.journal.Journal;
import com.bigdata.journal.Name2Addr;
import com.bigdata.journal.TemporaryRawStore;
import com.bigdata.mdi.IResourceMetadata;
-import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.mdi.SegmentMetadata;
import com.bigdata.rawstore.Bytes;
import com.bigdata.rawstore.IAddressManager;
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -51,7 +51,6 @@
import com.bigdata.journal.AbstractJournal;
import com.bigdata.journal.RootBlockException;
import com.bigdata.mdi.IResourceMetadata;
-import com.bigdata.mdi.LocalPartitionMetadata;
import com.bigdata.mdi.SegmentMetadata;
import com.bigdata.rawstore.AbstractRawStore;
import com.bigdata.resources.StoreManager;
Copied: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/JournalMetadata.java (from rev 3704, branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/JournalMetadata.java)
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/JournalMetadata.java (rev 0)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/JournalMetadata.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -0,0 +1,152 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+package com.bigdata.btree;
+
+import java.io.File;
+import java.util.UUID;
+
+import com.bigdata.journal.AbstractJournal;
+import com.bigdata.journal.IJournal;
+import com.bigdata.journal.Journal;
+import com.bigdata.mdi.AbstractResourceMetadata;
+
+/**
+ * Metadata required to locate a {@link Journal} resource.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public class JournalMetadata extends AbstractResourceMetadata {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3783897093328558238L;
+
+ public final boolean isIndexSegment() {
+
+ return false;
+
+ }
+
+ public final boolean isJournal() {
+
+ return true;
+
+ }
+
+ /**
+ * Return the file whose contents are the persistent state for the
+ * journal.
+ *
+ * @param journal
+ * The journal.
+ *
+ * @return The file.
+ */
+ private static String getFileString(final IJournal journal) {
+
+ final File file = journal.getFile();
+
+ if (file == null)
+ return "";
+
+ return file.getName();//toString();
+
+ }
+
+ /**
+ * De-serialization constructor.
+ */
+ public JournalMetadata() {
+
+ }
+
+ /**
+ * The description of a journal. The {@link JournalMetadata} state will not
+ * change as writes are made on the journal since it does not reflect
+ * anything exception the {@link UUID}, the filename, and the create time.
+ *
+ * @param journal
+ * The journal.
+ */
+ public JournalMetadata(final AbstractJournal journal) {
+
+ this(getFileString(journal), //journal.getBufferStrategy().getExtent(),
+ journal.getRootBlockView().getUUID(), //
+ journal.getRootBlockView().getCreateTime(), // createTime.
+ 0L // commitTime
+ );
+
+ }
+
+ /**
+ * Constructor variant used to indicate a read from a specific commitTime on
+ * a journal.
+ *
+ * @param journal
+ * The journal.
+ * @param commitTime
+ * The commitTime.
+ */
+ public JournalMetadata(final AbstractJournal journal, final long commitTime) {
+
+ this(getFileString(journal), //journal.getBufferStrategy().getExtent(),
+ journal.getRootBlockView().getUUID(),//
+ journal.getRootBlockView().getCreateTime(),//
+ commitTime
+ );
+
+ }
+
+ /**
+ * Data only constructor used by some unit tests.
+ *
+ * @param file
+ * @param uuid
+ * @param createTime
+ */
+ public JournalMetadata(final File file, /* long nbytes, */final UUID uuid,
+ final long createTime, final long commitTime) {
+
+ this(file.getName()/* ,nbytes */, uuid, createTime, commitTime);
+
+ }
+
+ /**
+ * Package private constructor used by the other constructors and when
+ * deserializing records.
+ *
+ * @param file
+ * @param uuid
+ * @param createTime
+ */
+ JournalMetadata(final String file, /* long nbytes, */final UUID uuid,
+ final long createTime, final long commitTime) {
+
+ super(file, /*nbytes, */ uuid, createTime, commitTime);
+
+ }
+
+}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/JournalMetadata.java
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
Added: svn:eol-style
+ native
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyAfterPartitionException.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyAfterPartitionException.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyAfterPartitionException.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -31,7 +31,6 @@
import java.io.File;
import com.bigdata.io.BytesUtil;
-import com.bigdata.mdi.LocalPartitionMetadata;
/**
* An exception thrown when a key lies after the half-open range of an index
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyBeforePartitionException.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyBeforePartitionException.java 2010-10-01 13:20:12 UTC (rev 3710)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/KeyBeforePartitionException.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -31,7 +31,6 @@
import java.io.File;
import com.bigdata.io.BytesUtil;
-import com.bigdata.mdi.LocalPartitionMetadata;
/**
* Exception thrown when a key is before the start of the half-open range of an
Copied: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/LocalPartitionMetadata.java (from rev 3704, branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/LocalPartitionMetadata.java)
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/LocalPartitionMetadata.java (rev 0)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/LocalPartitionMetadata.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -0,0 +1,706 @@
+/*
+
+Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+package com.bigdata.btree;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.UUID;
+
+import com.bigdata.io.BytesUtil;
+import com.bigdata.mdi.*;
+import org.CognitiveWeb.extser.LongPacker;
+import org.CognitiveWeb.extser.ShortPacker;
+
+import com.bigdata.journal.Journal;
+import com.bigdata.service.DataService;
+
+/**
+ * An immutable object providing metadata about a local index partition,
+ * including the partition identifier, the left and right separator keys
+ * defining the half-open key range of the index partition, and optionally
+ * defining the {@link com.bigdata.mdi.IResourceMetadata}[] required to materialize a view of
+ * that index partition.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ */
+public class LocalPartitionMetadata implements IPartitionMetadata,
+ Externalizable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1511361004851335936L;
+
+ /**
+ * The maximum length of the history string (4kb).
+ * <p>
+ * Note: The history is written each time the {@link IndexMetadata} is
+ * written and is read each time it is read so this can be the main driver
+ * of the size of the {@link IndexMetadata} record.
+ *
+ * @deprecated
+ */
+ protected final static transient int MAX_HISTORY_LENGTH = 0;//4 * Bytes.kilobyte32;
+
+ /**
+ * The unique partition identifier.
+ */
+ private int partitionId;
+
+ /**
+ *
+ * @see #getSourcePartitionId()
+ *
+ * @deprecated MoveTask manages without this field (it was required by the
+ * previous MOVE implementation).
+ */
+ private int sourcePartitionId;
+
+ /**
+ *
+ */
+ private byte[] leftSeparatorKey;
+ private byte[] rightSeparatorKey;
+
+ /**
+ * Description of the resources required to materialize a view of the index
+ * partition (optional - not stored when the partition metadata is stored on
+ * an {@link IndexSegmentStore}).
+ * <p>
+ * The entries in the array reflect the creation time of the resources. The
+ * earliest resource is listed first. The most recently created resource is
+ * listed last.
+ * <p>
+ * When present, the #of sources in the index partition view includes: the
+ * mutable {@link BTree}, any {@link BTree}s on historical journal(s)
+ * still incorporated into the view, and any {@link IndexSegment}s
+ * incorporated into the view.
+ */
+ private IResourceMetadata[] resources;
+
+ /**
+ * The reason why an index partition was created together with some metadata
+ * about when it was created.
+ */
+ private IndexPartitionCause cause;
+
+// /**
+// * A history of operations giving rise to the current partition metadata.
+// * E.g., register(timestamp), copyOnOverflow(timestamp), split(timestamp),
+// * join(partitionId,partitionId,timestamp), etc. This is truncated when
+// * serialized to keep it from growing without bound.
+// *
+// * @deprecated See {@link #getHistory()}
+// */
+// private String history;
+//
+// /**
+// * If the history string exceeds {@link #MAX_HISTORY_LENGTH} characters then
+// * truncates it to the last {@link #MAX_HISTORY_LENGTH}-3 characters,
+// * prepends "...", and returns the result. Otherwise returns the entire
+// * history string.
+// *
+// * @deprecated See {@link #history}
+// */
+// protected String getTruncatedHistory() {
+//
+// if (MAX_HISTORY_LENGTH == 0)
+// return "";
+//
+// String history = this.history;
+//
+// if(history.length() > MAX_HISTORY_LENGTH) {
+//
+// /*
+// * Truncate the history.
+// */
+//
+// final int len = history.length();
+//
+// final int fromIndex = len - (MAX_HISTORY_LENGTH - 3);
+//
+// assert fromIndex > 0 : "len=" + len + ", fromIndex=" + fromIndex
+// + ", maxHistoryLength=" + MAX_HISTORY_LENGTH;
+//
+// history = "..." + history.substring(fromIndex, len);
+//
+// }
+//
+// return history;
+//
+// }
+
+ /**
+ * De-serialization constructor.
+ */
+ public LocalPartitionMetadata() {
+
+ }
+
+ /**
+ *
+ * @param partitionId
+ * The unique partition identifier assigned by the
+ * {@link MetadataIndex}.
+ * @param sourcePartitionId
+ * <code>-1</code> unless this index partition is the target
+ * for a move, in which case this is the partition identifier of
+ * the source index partition.
+ * @param leftSeparatorKey
+ * The first key that can enter this index partition. The left
+ * separator key for the first index partition is always
+ * <code>new byte[]{}</code>. The left separator key MAY NOT
+ * be <code>null</code>.
+ * @param rightSeparatorKey
+ * The first key that is excluded from this index partition or
+ * <code>null</code> iff there is no upper bound.
+ * @param resources
+ * A description of each {@link Journal} or {@link IndexSegment}
+ * resource(s) required to compose a view of the index partition
+ * (optional).
+ * <p>
+ * The entries in the array reflect the creation time of the
+ * resources. The earliest resource is listed first. The most
+ * recently created resource is listed last.
+ * <p>
+ * Note: This is required if the {@link LocalPartitionMetadata}
+ * record will be saved on the {@link IndexMetadata} of a
+ * {@link BTree}. It is NOT recommended when it will be saved on
+ * the {@link IndexMetadata} of an {@link IndexSegment}. When
+ * the {@link IndexMetadata} is sent to a remote
+ * {@link DataService} this field MUST be <code>null</code> and
+ * the remote {@link DataService} will fill it in on arrival.
+ * @param cause
+ * The underlying cause for the creation of the index partition.
+ */
+// * @param history
+// * A human interpretable history of the index partition. The
+// * history is a series of whitespace delimited records each of
+// * more or less the form <code>foo(x,y,z)</code>. The history
+// * gets truncated when the {@link LocalPartitionMetadata} is
+// * serialized in order to prevent it from growing without bound.
+ public LocalPartitionMetadata(//
+ final int partitionId,//
+ final int sourcePartitionId,//
+ final byte[] leftSeparatorKey,//
+ final byte[] rightSeparatorKey,//
+ final IResourceMetadata[] resources,//
+ final IndexPartitionCause cause
+// final String history
+ ) {
+
+ /*
+ * Set fields first so that toString() can be used in thrown exceptions.
+ */
+
+ this.partitionId = partitionId;
+
+ this.sourcePartitionId = sourcePartitionId;
+
+ this.leftSeparatorKey = leftSeparatorKey;
+
+ this.rightSeparatorKey = rightSeparatorKey;
+
+ this.resources = resources;
+
+ this.cause = cause;
+
+// this.history = history;
+
+ /*
+ * Test arguments.
+ */
+
+ if (leftSeparatorKey == null)
+ throw new IllegalArgumentException("leftSeparatorKey");
+
+ // Note: rightSeparatorKey MAY be null.
+
+ if (rightSeparatorKey != null) {
+
+ final int cmp = BytesUtil.compareBytes(leftSeparatorKey,
+ rightSeparatorKey);
+
+ if (cmp >= 0) {
+
+ throw new IllegalArgumentException("Separator keys are "
+ + (cmp == 0 ? "equal" : "out of order") + " : " + this);
+
+ }
+
+ }
+
+ if (resources != null) {
+
+ if (resources.length == 0) {
+
+ throw new IllegalArgumentException("Empty resources array.");
+
+ }
+
+ for (IResourceMetadata t : resources) {
+
+ if (t == null)
+ throw new IllegalArgumentException(
+ "null value in resources[]");
+
+ }
+
+ /*
+ * This is the "live" journal.
+ *
+ * Note: The "live" journal is still available for writes. Index
+ * segments created off of this journal will therefore have a
+ * createTime that is greater than the firstCommitTime of this
+ * journal while being LTE to the lastCommitTime of the journal and
+ * strictly LT the commitTime of any other resource for this index
+ * partition.
+ */
+
+ if (!resources[0].isJournal()) {
+
+ throw new RuntimeException(
+ "Expecting a journal as the first resource: " + this);
+
+ }
+
+ /*
+ * Scan from 1 to n-1 - these are historical resources
+ * (non-writable). resources[0] is always the live journal. The
+ * other resources may be either historical journals or index
+ * segments.
+ *
+ * The order of the array is the order of the view. Reads on a
+ * FusedView will process the resources in the order in which they
+ * are specified by this array.
+ *
+ * The live journal gets listed first since it can continue to
+ * receive writes and therefore logically comes before any other
+ * resource in the ordering since any writes on the live index on
+ * the journal will be more recent than the data on the index
+ * segment.
+ *
+ * Normally, each successive entry in the resources[] will have an
+ * earlier createTime (smaller number) than the one that follows it.
+ * However, there is one exception. The createTime of the live
+ * journal MAY be less than the createTime of index segments created
+ * from that journal - this will be true if those indices are
+ * created from a historical view found on that journal and put into
+ * play while the journal is still the live journal. To work around
+ * this we start at the 2nd entry in the array.
+ */
+
+ /*
+ * Note: The practice of sending and index segment generated on one
+ * data service to another data service introduces another way in
+ * which the resource timestamp order can be broken. During the next
+ * synchronous overflow event you can see things like this:
+ *
+ * resourceMetadata=[
+ * JournalMetadata{filename=journal28417.jnl,uuid=add43d12-29b5-44e5-b26a-ae1b0694f67d,createTime=1236974533730},
+ * JournalMetadata{filename=journal28409.jnl,uuid=b954caf8-431b-42ae-9453-4c009398bec2,createTime=1236974293720},
+ * SegmentMetadata{filename=U8000_spo_OSP_part00050_28412.seg,uuid=cd954860-76fa-41ff-b788-e73a21b2c306,createTime=1236974525108},
+ * SegmentMetadata{filename=U8000_spo_OSP_part00050_28411.seg,uuid=35840589-6fb5-4691-b271-cf660186cd4b,createTime=1236974523976} ]
+ *
+ * This is in fact well-formed. However, because the index segments
+ * were generated on a different host, the create times get out of
+ * wack. For that reason, I have disabled checking here.
+ */
+ final boolean checkCreateTimes = false;
+
+ if (checkCreateTimes && resources.length > 2) {
+
+ long lastTimestamp = resources[1/*2ndEntry*/].getCreateTime();
+
+ for (int i = 2/* 3rd entry */; i < resources.length; i++) {
+
+ // createTime of the resource.
+ final long thisTimestamp = resources[i].getCreateTime();
+
+ if (lastTimestamp <= thisTimestamp) {
+
+ throw new RuntimeException(
+ "Resources out of timestamp order @ index="
+ + i + " : "+ this);
+
+ }
+
+ lastTimestamp = resources[i].getCreateTime();
+
+ }
+
+ }
+
+ }
+
+ }
+
+ final public int getPartitionId() {
+
+ return partitionId;
+
+ }
+
+ /**
+ * <code>-1</code> unless this index partition is the target for a move,
+ * in which case this is the partition identifier of the source index
+ * partition and the move operation has not been completed. This property is
+ * used to prevent the target data service from de-defining the index
+ * partition using a split, join or move operation while the MOVE operation
+ * is proceeding. The property is cleared to <code>-1</code> (which is an
+ * invalid index partition identifier) once the move has been completed
+ * successfully.
+ *
+ * @deprecated MoveTask manages without this field (it was required by the
+ * previous MOVE implementation).
+ */
+ final public int getSourcePartitionId() {
+
+ return sourcePartitionId;
+
+ }
+
+ final public byte[] getLeftSeparatorKey() {
+
+ return leftSeparatorKey;
+
+ }
+
+ final public byte[] getRightSeparatorKey() {
+
+ return rightSeparatorKey;
+
+ }
+
+ /**
+ * Description of the resources required to materialize a view of the index
+ * partition (optional, but required for a {@link BTree}).
+ * <p>
+ * The entries in the array reflect the creation time of the resources. The
+ * earliest resource is listed first. The most recently created resource is
+ * listed last. The order of the resources corresponds to the order in which
+ * a fused view of the index partition will be read. Reads begin with the
+ * most "recent" data for the index partition and stop as soon as there is a
+ * "hit" on one of the resources (including a hit on a deleted index entry).
+ * <p>
+ * When present, the #of sources in the index partition view includes: the
+ * mutable {@link BTree}, any {@link BTree}s on historical journal(s)
+ * still incorporated into the view, and any {@link IndexSegment}s
+ * incorporated into the view.
+ * <p>
+ * Note: the {@link IResourceMetadata}[] is only available when the
+ * {@link LocalPartitionMetadata} is attached to the {@link IndexMetadata}
+ * of a {@link BTree} and is NOT defined when the
+ * {@link LocalPartitionMetadata} is attached to an {@link IndexSegment}.
+ * The reason is that the index partition view is always described by the
+ * {@link BTree} and that view evolves as journals overflow. On the other
+ * hand, {@link IndexSegment}s are used as resources in index partition
+ * views but exist in a one to many relationship to those views.
+ */
+ final public IResourceMetadata[] getResources() {
+
+ return resources;
+
+ }
+
+ /**
+ * The reason why an index partition was created together with some metadata
+ * about when it was created.
+ */
+ final public IndexPartitionCause getIndexPartitionCause() {
+
+ return cause;
+
+ }
+
+// /**
+// * A history of the changes to the index partition.
+// *
+// * @deprecated I've essentially disabled the history (it is always empty
+// * when it is persisted). I found it nearly impossible to read.
+// * There are much saner ways to track what is going on in the
+// * federation. An analysis of the {@link Event} log is much more
+// * useful. If nothing else, you could examine the index
+// * partition in the metadata index by scanning the commit points
+// * and reading its state in each commit and reporting all state
+// * changes.
+// */
+// final public String getHistory() {
+//
+// return history;
+//
+// }
+
+ final public int hashCode() {
+
+ // per the interface contract.
+ return partitionId;
+
+ }
+
+ // Note: used by assertEquals in the test cases.
+ public boolean equals(final Object o) {
+
+ if (this == o)
+ return true;
+
+ final LocalPartitionMetadata o2 = (LocalPartitionMetadata) o;
+
+ if (partitionId != o2.partitionId)
+ return false;
+
+ if (!BytesUtil.bytesEqual(leftSeparatorKey, o2.leftSeparatorKey)) {
+
+ return false;
+
+ }
+
+ if (rightSeparatorKey == null) {
+
+ if (o2.rightSeparatorKey != null)
+ return false;
+
+ } else {
+
+ if (!BytesUtil.bytesEqual(rightSeparatorKey, o2.rightSeparatorKey)) {
+
+ return false;
+
+ }
+
+ }
+
+ if (resources.length != o2.resources.length)
+ return false;
+
+ for (int i = 0; i < resources.length; i++) {
+
+ if (!resources[i].equals(o2.resources[i]))
+ return false;
+
+ }
+
+ return true;
+
+ }
+
+ public String toString() {
+
+ return
+ "{ partitionId="+partitionId+
+ (sourcePartitionId!=-1?", sourcePartitionId="+sourcePartitionId:"")+
+ ", leftSeparator="+BytesUtil.toString(leftSeparatorKey)+
+ ", rightSeparator="+BytesUtil.toString(rightSeparatorKey)+
+ ", resourceMetadata="+Arrays.toString(resources)+
+ ", cause="+cause+
+// ", history="+history+
+ "}"
+ ;
+
+ }
+
+ /*
+ * Externalizable
+ */
+
+ private static final transient short VERSION0 = 0x0;
+
+ /**
+ * This version adds support for {@link IResourceMetadata#getCommitTime()},
+ * but that field is only serialized for a journal.
+ */
+ private static final transient short VERSION1 = 0x1;
+
+ /**
+ * This version serializes the {@link #partitionId} as 32-bits clean and
+ * gets rid of the <code>history</code> field.
+ */
+ private static final transient short VERSION2 = 0x2;
+
+ /**
+ * The current version.
+ */
+ private static final transient short VERSION = VERSION2;
+
+ public void readExternal(final ObjectInput in) throws IOException,
+ ClassNotFoundException {
+
+ final short version = ShortPacker.unpackShort(in);
+
+ switch (version) {
+ case VERSION0:
+ case VERSION1:
+ case VERSION2:
+ break;
+ default:
+ throw new IOException("Unknown version: " + version);
+ }
+
+ if (version < VERSION2) {
+ partitionId = (int) LongPacker.unpackLong(in);
+ } else {
+ partitionId = in.readInt();
+ }
+
+ sourcePartitionId = in.readInt(); // MAY be -1.
+
+ final int nresources = ShortPacker.unpackShort(in);
+
+ final int leftLen = (int) LongPacker.unpackLong(in);
+
+ final int rightLen = (int) LongPacker.unpackLong(in);
+
+ leftSeparatorKey = new byte[leftLen];
+
+ in.readFully(leftSeparatorKey);
+
+ if (rightLen != 0) {
+
+ rightSeparatorKey = new byte[rightLen];
+
+ in.readFully(rightSeparatorKey);
+
+ } else {
+
+ rightSeparatorKey = null;
+
+ }
+
+ cause = (IndexPartitionCause)in.readObject();
+
+ if (version < VERSION2) {
+ /* history = */in.readUTF();
+ }
+
+ resources = nresources>0 ? new IResourceMetadata[nresources] : null;
+
+ for (int j = 0; j < nresources; j++) {
+
+ final boolean isIndexSegment = in.readBoolean();
+
+ final String filename = in.readUTF();
+
+// long nbytes = LongPacker.unpackLong(in);
+
+ final UUID uuid = new UUID(in.readLong()/*MSB*/,in.readLong()/*LSB*/);
+
+ final long createTime = in.readLong();
+
+ long commitTime = 0L;
+ if (version >= VERSION1 && !isIndexSegment) {
+
+ commitTime = in.readLong();
+
+ }
+
+ resources[j] = (isIndexSegment //
+ ? new SegmentMetadata(filename, /*nbytes,*/ uuid, createTime) //
+ : new JournalMetadata(filename, /*nbytes,*/ uuid, createTime, commitTime) //
+ );
+
+ }
+
+ }
+
+ public void writeExternal(final ObjectOutput out) throws IOException {
+
+ ShortPacker.packShort(out, VERSION);
+
+ if (VERSION < VERSION2) {
+ LongPacker.packLong(out, partitionId);
+ } else {
+ out.writeInt(partitionId);
+ }
+
+ out.writeInt(sourcePartitionId); // MAY be -1.
+
+ final int nresources = (resources == null ? 0 : resources.length);
+
+ assert nresources < Short.MAX_VALUE;
+
+ ShortPacker.packShort(out, (short) nresources);
+
+ LongPacker.packLong(out, leftSeparatorKey.length);
+
+ LongPacker.packLong(out, rightSeparatorKey == null ? 0
+ : rightSeparatorKey.length);
+
+ out.write(leftSeparatorKey);
+
+ if (rightSeparatorKey != null) {
+
+ out.write(rightSeparatorKey);
+
+ }
+
+ out.writeObject(cause);
+
+ if (VERSION < VERSION2) {
+ out.writeUTF("");// getTruncatedHistory()
+ }
+
+ /*
+ * Note: we serialize using the IResourceMetadata interface so that we
+ * can handle different subclasses and then special case the
+ * deserialization based on the boolean flag. This is significantly more
+ * compact than using an Externalizable for each ResourceMetadata object
+ * since we do not have to write the class names for those objects.
+ */
+
+ for (int j = 0; j < nresources; j++) {
+
+ final IResourceMetadata rmd = resources[j];
+
+ final boolean isSegment = rmd.isIndexSegment();
+
+ out.writeBoolean(isSegment);
+
+ out.writeUTF(rmd.getFile());
+
+// LongPacker.packLong(out,rmd.size());
+
+ final UUID resourceUUID = rmd.getUUID();
+
+ out.writeLong(resourceUUID.getMostSignificantBits());
+
+ out.writeLong(resourceUUID.getLeastSignificantBits());
+
+ out.writeLong(rmd.getCreateTime());
+
+ if (!isSegment) {
+
+ out.writeLong(rmd.getCommitTime());
+
+ }
+
+ }
+
+ }
+
+}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/LocalPartitionMetadata.java
___________________________________________________________________
Added: svn:keywords
+ Id Date Revision Author HeadURL
Added: svn:eol-style
+ native
Copied: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/MetadataIndex.java (from rev 3704, branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/MetadataIndex.java)
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/MetadataIndex.java (rev 0)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/btree/MetadataIndex.java 2010-10-01 15:01:16 UTC (rev 3711)
@@ -0,0 +1,513 @@
+/**
+
+Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved.
+
+Contact:
+ SYSTAP, LLC
+ 4501 Tower Road
+ Greensboro, NC 27410
+ lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+package com.bigdata.btree;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.UUID;
+
+import com.bigdata.mdi.PartitionLocator;
+import org.CognitiveWeb.extser.LongPacker;
+
+import com.bigdata.btree.keys.IKeyBuilderFactory;
+import com.bigdata.btree.view.FusedView;
+import com.bigdata.journal.ICommitter;
+import com.bigdata.journal.IResourceManager;
+import com.bigdata.rawstore.IRawStore;
+import com.bigdata.service.MetadataService;
+
+/**
+ * A metadata index for the partitions of a distributed index. There is one
+ * metadata index for each distributed index. The keys of the metadata index are
+ * the first key that would be directed into the corresponding index segment,
+ * e.g., a <em>separator key</em> (this is just the standard btree semantics).
+ * The values are serialized {@link com.bigdata.mdi.PartitionLocator} objects.
+ * <p>
+ * Note: At this time the recommended scale-out approach for the metadata index
+ * is to place the metadata indices on a {@link MetadataService} (the same
+ * {@link MetadataService} may be used for an arbitrary #of scale-out indices)
+ * and to <em>replicate</em> the state for the {@link MetadataService} onto
+ * failover {@link MetadataService}s. Since the {@link MetadataIndex} may grow
+ * without bound, you simply need to have enough disk on hand for it (the size
+ * requirements are quite modest). Further, the {@link MetadataService} MUST NOT
+ * be used to hold the data for the scale-out indices themselves since the
+ * {@link MetadataIndex} can not undergo {@link IResourceManager#overflow()}.
+ * <p>
+ * One advantage of this approach is that the {@link MetadataIndex} is
+ * guaranteed to hold all historical states of the partition definitions for
+ * each index - effectively it is an immortal store for the partition metadata.
+ * On the other hand it is not possible to compact the metadata index without
+ * taking the database offline.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
+ * @version $Id$
+ *
+ * @todo The {@link MetadataIndex} does NOT support either overflow (it may NOT
+ * be a {@link FusedView}) NOR key-range splits. There are several issues
+ * involved:
+ * <p>
+ * (a) How to track the next partition identifier to be assigned to an
+ * index partition for the managed index. Currently this value is written
+ * in the {@link MetadataIndexCheckpoint} record and is propagated to the
+ * new backing store on overflow. However, if the metadata index is split
+ * into partitions then additional care MUST be taken to use only the
+ * value of that field on the 'meta-meta' index.
+ * <p>
+ * (b) how to locate the partitions of the metadata index itself.
+ *
+ * @todo one way to locate the metadata-index partitions is to hash partition
+ * the metadata index and range queries can be flooded to all partitions.
+ * the #of metadata service nodes can be changed by a suitable broadcast
+ * event in which clients have to change to the new hash basis. this
+ * feature can be generalized to provide hash partitioned indices as well
+ * as key-range partitioned indices.
+ *
+ * @todo A metadata index can be recovered by a distributed process running over
+ * the data services. Each data service reports all index partitions. The
+ * reports are collected and the index is rebuilt from the reports. Much
+ * like a map/reduce job.
+ */
+public class MetadataIndex extends BTree implements IMetadataIndex {
+
+ /**
+ * Used to implement find(byte[] key).
+ */
+ private transient final MetadataIndexView view;
+
+ public MetadataIndexMetadata getIndexMetadata() {
+
+ return (MetadataIndexMetadata) super.getIndexMetadata();
+
+ }
+
+ public IndexMetadata getScaleOutIndexMetadata() {
+
+ return getIndexMetadata().getManagedIndexMetadata();
+
+ }
+
+ /**
+ * Returns the value to be assigned to the next partition created on this
+ * {@link MetadataIndex} and then increments the counter. The counter will
+ * be made restart-safe iff the index is dirty, the index is registered as
+ * an {@link ICommitter}, and the store on which the index is stored is
+ * committed.
+ * <p>
+ * Note: The metadata index uses a 32-bit partition identifier rather than
+ * the {@link #getCounter()}. The reason is that the {@link Counter} uses
+ * the partition identifier in the high word and a partition local counter
+ * in the low word. Therefore we have to centralize the assignment of the
+ * partition identifier, even when the metadata index is itself split into
+ * partitions. Requests for partition identifiers need to be directed to the
+ * root partition (L0) for the {@link MetadataIndex}.
+ */
+ public int incrementAndGetNextPartitionId() {
+
+ final int tmp = nextPartitionId++;
+
+ /*
+ * Notify listener that the index is dirty.
+ */
+
+ fireDirtyEvent();
+
+ return tmp;
+
+ }
+
+ private int nextPartitionId;
+
+ /**
+ * Create a new {@link MetadataIndex}.
+ *
+ * @param store
+ * The backing store.
+ * @param indexUUID
+ * The unique identifier for the metadata index.
+ * @param managedIndexMetadata
+ * The metadata template for the managed scale-out index.
+ */
+ public static MetadataIndex create(IRawStore store, UUID indexUUID,
+ IndexMetadata managedIndexMetadata) {
+
+ final MetadataIndexMetadata metadata = new MetadataIndexMetadata(
+ managedIndexMetadata.getName(), indexUUID, managedIndexMetadata);
+
+ /*
+ * @todo the metadata index should use probably delete markers so that
+ * we can do compacting merges on it, but that is really moot until we
+ * support overflow of the metadataService and partitioning of the
+ * metadata index.
+ */
+
+ metadata.setDeleteMarkers(true);
+
+ /*
+ * Override the implementation class.
+ */
+
+ metadata.setBTreeClassName(MetadataIndex.class.getName());
+
+ /*
+ * Override the checkpoint record implementation class.
+ */
+ metadata.setCheckpointClassName(MetadataIndexCheckpoint.class.getName());
+
+ /*
+ * Tuple serializer.
+ */
+ metadata.setTupleSerializer(PartitionLocatorTupleSerializer.newInstance());
+
+ return (MetadataIndex) BTree.create(store, metadata);
+
+ }
+
+ /**
+ * Required ctor.
+ *
+ * @param store
+ * @param checkpoint
+ * @param metadata
+ */
+ public MetadataIndex(IRawStore store, Checkpoint checkpoint, IndexMetadata metadata, boolean readOnly) {
+
+ super(store, checkpoint, metadata, readOnly);
+
+ /*
+ * copy the initial value from the checkpoint record.
+ */
+
+ nextPartitionId = ((MetadataIndexCheckpoint)checkpoint).getNextPartitionId();
+
+ view = new MetadataIndexView(this);
+
+ }
+
+ /**
+ * Extended to require a checkpoint if {@link #incrementAndGetNextPartitionId()} has been
+ * invoked.
+ */
+ public boolean needsCheckpoint() {
+
+ if(nextPartitionId != ((MetadataIndexCheckpoint)getCheckpoint()).getNextPartitionId()) {
+
+ return true;
+
+ }
+
+ return super.needsCheckpoint();
+ ...
[truncated message content] |
|
From: <ble...@us...> - 2010-10-05 20:18:42
|
Revision: 3731
http://bigdata.svn.sourceforge.net/bigdata/?rev=3731&view=rev
Author: blevine218
Date: 2010-10-05 20:18:36 +0000 (Tue, 05 Oct 2010)
Log Message:
-----------
Execute unit tests using surefire plugin (part 2)
- Unit tests now run as part of the build lifecycle.
- Unit tests can be skipped by adding -DskipTests to the mvn command-line
- log4j.configuration and log4j.path now point to new, less verbose log4j.properties file located in .../testing/conf/log4j.properties
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/pom.xml
branches/maven_scaleout/bigdata-integ/pom.xml
branches/maven_scaleout/pom.xml
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/log4j.properties
Modified: branches/maven_scaleout/bigdata-core/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/pom.xml 2010-10-05 19:57:25 UTC (rev 3730)
+++ branches/maven_scaleout/bigdata-core/pom.xml 2010-10-05 20:18:36 UTC (rev 3731)
@@ -14,38 +14,37 @@
<name>Bigdata Core</name>
<url>http://www.bigdata.com</url>
+ <description>The Bigdata Core</description>
- <properties>
- <!-- group ID for non-public bigdata dependencies. -->
+ <properties>
+ <!-- group ID for non-public bigdata dependencies. -->
<thirdParty.groupId>com.bigdata.thirdparty</thirdParty.groupId>
-
- <!-- These properties are used to set system properties that are required by the unit
- tests. See the surefire plugin configuration below. Any of these can be overridden on
- the command-line by adding -D<property-name>=<propert-value>.
- -->
-
- <!-- Skip running unit tests by default until we get the kinks worked out. Can be overridden
- by adding '-DskipTests=false' to the command-line -->
- <skipTests>true</skipTests>
-
- <!-- This directory is created when the deployment tarball is created
- during the 'package' phase by the maven assembly plugin. If the naming
- convention as defined in src/main/assembly/deploy.xml changes, this property
- needs to change as well. -->
+
+ <!--
+ These properties are used to set system properties that are required by the unit tests. See the surefire plugin configuration below. Any of these can be overridden on the command-line by
+ adding -D<property-name>=<propert-value>.
+ -->
+
+ <!--
+ This directory is created when the deployment tarball is created during the 'package' phase by the maven assembly plugin. If the naming convention as defined in
+ src/main/assembly/deploy.xml changes, this property needs to change as well.
+
+ TODO: May want to see if these can be promoted to the parent POM and shared with the bigdata-integ module
+ -->
<deploy.root.dir>${project.build.directory}/${project.artifactId}-${project.version}-deploy</deploy.root.dir>
-
+
<deploy.dir>${deploy.root.dir}/${project.artifactId}-${project.version}</deploy.dir>
<app.home>${deploy.dir}</app.home>
<test.dir>${deploy.dir}/testing</test.dir>
- <deploy.conf.dir>${test.dir}/conf</deploy.conf.dir>
+ <test.conf.dir>${test.dir}/conf</test.conf.dir>
<deploy.lib>${deploy.dir}/lib</deploy.lib>
<test.codebase.dir>${deploy.lib.dl}</test.codebase.dir>
<test.codebase.port>23333</test.codebase.port>
- <java.security.policy>${deploy.conf.dir}/policy.all</java.security.policy>
- <log4j.configuration>${deploy.dir}/var/config/logging/log4j.properties</log4j.configuration>
+ <java.security.policy>${test.conf.dir}/policy.all</java.security.policy>
+ <log4j.configuration>${test.conf.dir}/log4j.properties</log4j.configuration>
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
<default.nic>eth0</default.nic>
-
+
<!-- Set to empty string to indicate "unset." Application code will set a reasonable default -->
<federation.name></federation.name>
</properties>
@@ -56,8 +55,10 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
- <!-- Apparently Javac may compile java source files inside jars put on the classpath. Weird. Zookeeper 3.2.1 jar contained classes and sources, and under some circumstances, the
- java files were getting recompiled and put into the bigdata jar. This setting forces javac to only look for source in the current maven source directory. -->
+ <!--
+ Apparently Javac may compile java source files inside jars put on the classpath. Weird. Zookeeper 3.2.1 jar contained classes and sources, and under some circumstances, the
+ java files were getting recompiled and put into the bigdata jar. This setting forces javac to only look for source in the current maven source directory.
+ -->
<sourcepath>${project.build.sourceDirectory}</sourcepath>
</compilerArguments>
</configuration>
@@ -110,9 +111,10 @@
</executions>
</plugin>
- <!-- Configure the surefire plugin to run in the 'integration-test' phase rather than the 'test' phase.
- This allows us to run the unit tests after packaging has been done, but before the build artifacts
- are installed during the 'install' phase -->
+ <!--
+ Configure the surefire plugin to run in the 'integration-test' phase rather than the 'test' phase. This allows us to run the unit tests after packaging has been done, but before the
+ build artifacts are installed during the 'install' phase
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -127,10 +129,11 @@
<goal>test</goal>
</goals>
<configuration>
+ <testFailureIgnore>true</testFailureIgnore>
<skip>false</skip>
<!-- Run only the top-level suite which in turn runs the other suites and tests -->
<test>com.bigdata.TestAll</test>
-
+
<!-- These system properties are required by the unit tests. -->
<systemPropertyVariables>
<java.security.policy>${java.security.policy}</java.security.policy>
@@ -141,7 +144,7 @@
<log4j.path>${log4j.configuration}</log4j.path>
<default.nic>${default.nic}</default.nic>
<federation.name>${federation.name}</federation.name>
-
+
<classserver.jar>${deploy.lib}/classserver.jar</classserver.jar>
<colt.jar>${deploy.lib}/colt.jar</colt.jar>
<ctc_utils.jar>${deploy.lib}/ctc_utils.jar</ctc_utils.jar>
@@ -429,8 +432,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
- <!-- These exclusions are to address the fact that 1.2.15 added new features that depends on Sun specific jars, but these jars cannot be made available due to Sun's click-through requirement
- on them. We aren't using the new features anyway, so they are safe to exclude. log4j should have made these optional in their POM. -->
+ <!--
+ These exclusions are to address the fact that 1.2.15 added new features that depends on Sun specific jars, but these jars cannot be made available due to Sun's click-through
+ requirement on them. We aren't using the new features anyway, so they are safe to exclude. log4j should have made these optional in their POM.
+ -->
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -590,7 +595,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
Added: branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/log4j.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/log4j.properties (rev 0)
+++ branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/log4j.properties 2010-10-05 20:18:36 UTC (rev 3731)
@@ -0,0 +1,35 @@
+# Default log4j configuration. See the individual classes for the
+# specific loggers, but generally they are named for the class in
+# which they are defined.
+
+# Default log4j configuration for testing purposes.
+#
+# You probably want to set the default log level to ERROR.
+
+#log4j.rootCategory=ALL, dest2
+log4j.rootCategory=ERROR, dest2
+
+# Loggers.
+# Note: logging here at INFO or DEBUG will significantly impact throughput!
+#log4j.logger.com.bigdata=ERROR
+#log4j.logger.org.apache=ERROR
+#log4j.junit=ERROR
+
+# dest1
+log4j.appender.dest1=org.apache.log4j.ConsoleAppender
+log4j.appender.dest1.layout=org.apache.log4j.PatternLayout
+log4j.appender.dest1.layout.ConversionPattern=%-5p: %r %l: %m%n
+#log4j.appender.dest1.layout.ConversionPattern=%-5p: %m%n
+#log4j.appender.dest1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+#log4j.appender.dest1.layout.ConversionPattern=%-4r(%d) [%t] %-5p %c(%l:%M) %x - %m%n
+
+# dest2 includes the thread name and elapsed milliseconds.
+# Note: %r is elapsed milliseconds.
+# Note: %t is the thread name.
+# See http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html
+log4j.appender.dest2=org.apache.log4j.ConsoleAppender
+log4j.appender.dest2.layout=org.apache.log4j.PatternLayout
+log4j.appender.dest2.layout.ConversionPattern=%-5p: %r %X{hostname} %X{serviceUUID} %X{taskname} %X{timestamp} %X{resources} %t %l: %m%n
+
+
+
Modified: branches/maven_scaleout/bigdata-integ/pom.xml
===================================================================
--- branches/maven_scaleout/bigdata-integ/pom.xml 2010-10-05 19:57:25 UTC (rev 3730)
+++ branches/maven_scaleout/bigdata-integ/pom.xml 2010-10-05 20:18:36 UTC (rev 3731)
@@ -10,6 +10,7 @@
<groupId>com.bigdata</groupId>
<artifactId>bigdata-integration-test</artifactId>
<name>bigdata Integration Tests</name>
+ <description>The Bigdata Integration Tests</description>
<!--
Note: Most properties include the "integ." prefix so that they
@@ -221,7 +222,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.6</version>
<reportSets>
<reportSet>
<id>integration-tests</id>
Modified: branches/maven_scaleout/pom.xml
===================================================================
--- branches/maven_scaleout/pom.xml 2010-10-05 19:57:25 UTC (rev 3730)
+++ branches/maven_scaleout/pom.xml 2010-10-05 20:18:36 UTC (rev 3731)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.bigdata</groupId>
@@ -49,13 +48,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</plugin>
<plugin>
@@ -84,11 +83,11 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
<!-- slf4j -->
@@ -106,7 +105,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
+ <configuration>
+ <xrefLocation>${project.reporting.outputDirectory}/../xref-test</xrefLocation>
+ </configuration>
</plugin>
</plugins>
</reporting>
@@ -148,14 +150,16 @@
<configuration>
<jdk>1.5</jdk>
<!--
- To use clover with bigdata, you should
- add the following to your maven settings
- file, .m2/settings.xml <profile>
- <id>bigdata-clover</id> <activation>
- <activeByDefault>true</activeByDefault>
- </activation> <properties>
- <maven.clover.licenseLocation>/your/path/to/clover.license</maven.clover.licenseLocation>
- </properties> </profile>
+ To use clover with bigdata, you should add the following to your maven settings file, .m2/settings.xml
+ <profile>
+ <id>bigdata-clover</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <maven.clover.licenseLocation>/your/path/to/clover.license</maven.clover.licenseLocation>
+ </properties>
+ </profile>
-->
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <res...@us...> - 2010-10-13 15:08:35
|
Revision: 3787
http://bigdata.svn.sourceforge.net/bigdata/?rev=3787&view=rev
Author: resendes
Date: 2010-10-13 15:08:24 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
Merge from bbb_cleanup branch
- added com.bigdata.util.config fixes
- added com.bigdata.util.config unit tests
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigDeployUtil.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigurationUtil.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/Log4jLoggingHandler.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/LogUtil.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/NicUtil.java
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/ConfigDeployUtilTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/ConfigDeployUtilTest2.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/ConfigurationUtilTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/Log4jLoggingHandlerTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/LogUtilTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/NicUtilTest.java
Removed Paths:
-------------
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/ConfigDeployUtilTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/ConfigDeployUtilTest2.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/ConfigurationUtilTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/Log4jLoggingHandlerTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/LogUtilTest.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/config/NicUtilTest.java
Property Changed:
----------------
branches/maven_scaleout/
branches/maven_scaleout/bigdata-core/bigdata-perf/
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/
branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL/
branches/maven_scaleout/bigdata-core/dsi-utils/lib/
branches/maven_scaleout/bigdata-core/dsi-utils/src/
branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/bigdata-core/osgi/
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/main/java/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/
branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/
Property changes on: branches/maven_scaleout
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bbb_cleanup:3709-3781
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/bigdata-perf:3588-3690
/trunk/bigdata-perf:3379-3541
+ /branches/bbb_cleanup/bigdata-core/bigdata-perf:3588-3690,3709-3781
/trunk/bigdata-perf:3379-3541
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources:3588-3690
/branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/trunk/bigdata-perf/lubm/src/resources:3379-3541
+ /branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources:3588-3690,3709-3781
/branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/trunk/bigdata-perf/lubm/src/resources:3379-3541
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL:3588-3690
/trunk/dsi-utils/LEGAL:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL:3588-3690,3709-3781
/trunk/dsi-utils/LEGAL:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/dsi-utils/lib:3588-3690
/trunk/dsi-utils/lib:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/lib:3588-3690,3709-3781
/trunk/dsi-utils/lib:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/dsi-utils/src:3588-3690
/trunk/dsi-utils/src:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/src:3588-3690,3709-3781
/trunk/dsi-utils/src:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3690,3709-3781
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3690,3709-3781
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/osgi
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/osgi:3588-3690
/trunk/osgi:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/osgi:3588-3690,3709-3781
/trunk/osgi:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/bin:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/bin:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini:3588-3690
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
+ /branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini:3588-3690,3709-3781
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/java:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/java:3588-3690,3709-3781
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr:3588-3690
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr:3588-3690,3709-3781
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco:3588-3690
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco:3588-3690,3709-3781
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench:3588-3690
/branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench:3588-3690,3709-3781
/branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util:3588-3690
/branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util:3588-3690,3709-3781
/branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigDeployUtil.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigDeployUtil.java 2010-10-13 14:18:44 UTC (rev 3786)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigDeployUtil.java 2010-10-13 15:08:24 UTC (rev 3787)
@@ -34,6 +34,8 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.net.SocketException;
+import java.text.NumberFormat;
+import java.text.ParseException;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
@@ -46,6 +48,12 @@
* invoked from within a Jini configuration.
*/
public class ConfigDeployUtil {
+
+ private ConfigDeployUtil() {
+ //prevent instantiation
+ throw new AssertionError
+ ("ConfigDeployUtil cannot be instantiated");
+ }
private static Properties deploymentProps = null;
@@ -57,8 +65,26 @@
private static final String TYPE = ".type";
private static final String FALLBACK_FEDNAME_FORMAT = "bigdata.test.group-%s";
- private static final String TEMPLATE_TOKEN_PATTERN = "@.*@";
+
+ //use current locale
+ private static final NumberFormat numberFormat = NumberFormat.getInstance();
+ /**
+ * Gets the <code>String</code> value associated with the given parameter
+ * in the configured properties file. The value, if any, returned will be:
+ * 1) the explicitly defined value for the property, or
+ * 2) the default value for that property, if a default exists.
+ * If the provided parameter has an associated set of valid entries in the
+ * properties files, then the value obtained, above, will be validated
+ * against those entries. If either the value (explicit or default) can't be
+ * found or fails the validation check,
+ * a <code>ConfigurationException</code> will be thrown.
+ * @param parameter The property name to lookup
+ * @return the <code>String</code> value associated the requested parameter,
+ * if available
+ * @throws ConfigurationException if the parameter value
+ * (explicit or default) was not defined.
+ */
public static String getString(String parameter)
throws ConfigurationException
{
@@ -66,7 +92,23 @@
validateString(parameter, value);
return value;
}
-
+
+ /**
+ * Gets the <code>String[]</code> value associated with the given parameter
+ * in the configured properties file. The value, if any, returned will be:
+ * 1) the explicitly defined value for the property, or
+ * 2) the default value for that property, if a default exists.
+ * If the provided parameter has an associated set of valid entries in the
+ * properties files, then the component values obtained, above, will be validated
+ * against those entries. If either the value (explicit or default) can't be
+ * found or fails the validation check,
+ * a <code>ConfigurationException</code> will be thrown.
+ * @param parameter The property name to lookup
+ * @return the <code>String[]</code> value associated the requested parameter,
+ * if available
+ * @throws ConfigurationException if the parameter value
+ * (explicit or default) was not defined.
+ */
public static String[] getStringArray(String parameter)
throws ConfigurationException
{
@@ -75,12 +117,46 @@
return value;
}
+ /**
+ * Gets the <code>int</code> value associated with the given parameter
+ * in the configured properties file. The value, if any, returned will be:
+ * 1) the explicitly defined value for the property, or
+ * 2) the default value for that property, if a default exists.
+ * If the provided parameter has an associated set of valid entries in the
+ * properties files, then the value obtained, above, will be validated
+ * against those entries. If either the value (explicit or default) can't be
+ * found or fails the validation check,
+ * a <code>ConfigurationException</code> will be thrown.
+ * @param parameter The property name to lookup
+ * @return the <code>int</code> value associated the requested parameter,
+ * if available
+ * @throws ConfigurationException if the parameter value
+ * (explicit or default) was not defined.
+ */
+
public static int getInt(String parameter) throws ConfigurationException {
int value;
value = validateInt(parameter, get(parameter));
return value;
}
+ /**
+ * Gets the <code>long</code> value associated with the given parameter
+ * in the configured properties file. The value, if any, returned will be:
+ * 1) the explicitly defined value for the property, or
+ * 2) the default value for that property, if a default exists.
+ * If the provided parameter has an associated set of valid entries in the
+ * properties files, then the value obtained, above, will be validated
+ * against those entries. If either the value (explicit or default) can't be
+ * found or fails the validation check,
+ * a <code>ConfigurationException</code> will be thrown.
+ * @param parameter The property name to lookup
+ * @return the <code>long</code> value associated the requested parameter,
+ * if available
+ * @throws ConfigurationException if the parameter value
+ * (explicit or default) was not defined.
+ */
+
public static long getLong(String parameter) throws ConfigurationException
{
long value;
@@ -88,60 +164,97 @@
return value;
}
- public static boolean getBoolean(String parameter)
+ /**
+ * Gets the <code>boolean</code> value associated with the given parameter
+ * in the configured properties file. The value, if any, returned will be:
+ * 1) the explicitly defined value for the property, or
+ * 2) the default value for that property, if a default exists.
+ * If the provided parameter has an associated set of valid entries in the
+ * properties files, then the value obtained, above, will be validated
+ * against those entries. If either the value (explicit or default) can't be
+ * found or fails the validation check,
+ * a <code>ConfigurationException</code> will be thrown.
+ * @param parameter The property name to lookup
+ * @return the <code>boolean</code> value associated the requested parameter,
+ * if available
+ * @throws ConfigurationException if the parameter value
+ * (explicit or default) was not defined.
+ */
+ public static boolean getBoolean(String parameter) throws ConfigurationException
+ {
+ boolean value;
+ value = validateBoolean(parameter, get(parameter));
+ return value;
+ }
+
+ private static boolean validateBoolean(String parameter, String value)
throws ConfigurationException {
boolean boolValue = false;
- String value;
- try {
- value = get(parameter);
- } catch (Exception ex) {
- throw new ConfigurationException("parameter value ["+parameter+"] "
- +"neither 'true' nor 'false'");
- }
- if( value != null && value.equalsIgnoreCase("true")
- || value.equalsIgnoreCase("false") )
+
+ if( value != null && (value.equalsIgnoreCase("true")
+ || value.equalsIgnoreCase("false")) )
{
boolValue = Boolean.parseBoolean(value);
} else {
throw new ConfigurationException("parameter value ["+parameter+"] "
- +"neither 'true' nor 'false'");
+ +"is neither 'true' nor 'false'");
}
return boolValue;
}
+ /**
+ * Gets the description value associated with the given parameter
+ * in the configured properties file. The method returns
+ * <code>null</code> if the property is not found.
+ * @param parameter The property name to lookup
+ * @return the <code>String</code> value associated the requested parameter,
+ * if available. Otherwise return <code>null</code>
+ * @throws ConfigurationException if there was a problem accessing
+ * the parameter value.
+ */
+
public static String getDescription(String parameter)
throws ConfigurationException
{
String value;
- if(deploymentProps == null) {
- deploymentProps = new Properties();
- loadDeployProps(deploymentProps);
- }
- value = deploymentProps.getProperty(parameter + DESCRIPTION);
+ value = getDeploymentProperties().getProperty(parameter + DESCRIPTION);
return value;
}
+ /**
+ * Gets the type value associated with the given parameter
+ * in the configured properties file. The method returns
+ * <code>null</code> if the property is not found.
+ * @param parameter The property name to lookup
+ * @return the <code>String</code> value of the type
+ * associated the requested parameter,
+ * if available. Otherwise return <code>null</code>
+ * @throws ConfigurationException if there was a problem accessing
+ * the parameter value.
+ */
+
public static String getType(String parameter)
throws ConfigurationException
{
String value;
- if (deploymentProps == null) {
- deploymentProps = new Properties();
- loadDeployProps(deploymentProps);
- }
- value = deploymentProps.getProperty(parameter + TYPE);
+ value = getDeploymentProperties().getProperty(parameter + TYPE);
return value;
}
+ /**
+ * Gets the default value associated with the given parameter
+ * in the configured properties file.
+ * @param parameter The property name to lookup
+ * @return the <code>String</code> value of the type
+ * associated the requested parameter,
+ * if available. Otherwise return <code>null</code>
+ * @throws ConfigurationException if no default value was specified
+ */
public static String getDefault(String parameter)
throws ConfigurationException
{
String value;
- if (deploymentProps == null) {
- deploymentProps = new Properties();
- loadDeployProps(deploymentProps);
- }
- value = deploymentProps.getProperty(parameter + DEFAULT);
+ value = getDeploymentProperties().getProperty(parameter + DEFAULT);
if (value == null) {
throw new ConfigurationException
("deployment parameter not found ["+parameter+"]");
@@ -150,7 +263,7 @@
}
/**
- * Returns a <code>String</code> array whose elments represent the
+ * Returns a <code>String</code> array whose elements represent the
* lookup service groups to discover. If the system property named
* "federation.name" is set then that value be used; otherwise,
* the deployment properties files will be consulted.
@@ -164,7 +277,7 @@
}
/**
- * Retrieve the federation name (also used as Jini group name) via this pecking pecking order:
+ * Retrieve the federation name (also used as Jini group name) via this pecking order:
* <ol>
* <li>From the Java system property: <code>federation.name</code></li>
* <li>From the deployment properties file. Note that a value from the deployment
@@ -254,11 +367,7 @@
private static String get(String parameter) throws ConfigurationException {
String value;
- if (deploymentProps == null) {
- deploymentProps = new Properties();
- loadDeployProps(deploymentProps);
- }
- value = deploymentProps.getProperty(parameter);
+ value = getDeploymentProperties().getProperty(parameter);
if (value == null) value = getDefault(parameter);
return value;
}
@@ -267,7 +376,7 @@
throws ConfigurationException
{
String validValuesStr =
- (String) deploymentProps.get(parameter + STRINGVALS);
+ (String) getDeploymentProperties().get(parameter + STRINGVALS);
if (validValuesStr != null) {
String[] validValues = validValuesStr.split(",");
@@ -284,7 +393,7 @@
throws ConfigurationException
{
String validValuesStr =
- (String)(deploymentProps.get(parameter + STRINGVALS));
+ (String)(getDeploymentProperties().get(parameter + STRINGVALS));
String[] values = value.split(",");
if (validValuesStr != null) {
@@ -304,48 +413,77 @@
private static int validateInt(String parameter, String strvalue)
throws ConfigurationException
{
- String maxString = (String)(deploymentProps.get(parameter + MAX));
- String minString = (String)(deploymentProps.get(parameter + MIN));
+ String maxString = (String)(getDeploymentProperties().get(parameter + MAX));
+ String minString = (String)(getDeploymentProperties().get(parameter + MIN));
int value = str2int(strvalue);
if (maxString != null) {
- int max = Integer.parseInt(maxString);
- if (value > max) {
- throw new ConfigurationException("parameter ["+parameter+"] "
- +"exceeds maximum ["+max+"]");
+ try {
+ int max = numberFormat.parse(maxString).intValue();
+ if (value > max) {
+ throw new ConfigurationException("parameter ["+parameter+"] "
+ +"exceeds maximum ["+max+"]");
+ }
+ } catch (ParseException e) {
+ throw new NumberFormatException(
+ "Invalid maximum integer for parameter: " + parameter);
+
}
}
+
+ if (minString != null) {
+ try {
+ int min = numberFormat.parse(minString).intValue();
+ if (value < min) {
+ throw new ConfigurationException("parameter ["+parameter+"] "
+ + "is less than manimum ["+min+"]");
+ }
+ } catch (ParseException e) {
+ throw new NumberFormatException(
+ "Invalid minimum integer for parameter: " + parameter);
+ }
+ }
+
return value;
}
private static long validateLong(String parameter, String strvalue)
throws ConfigurationException
{
- String maxString = (String)(deploymentProps.get(parameter + MAX));
- String minString = (String)(deploymentProps.get(parameter + MIN));
+ String maxString = (String)(getDeploymentProperties().get(parameter + MAX));
+ String minString = (String)(getDeploymentProperties().get(parameter + MIN));
long value = str2long(strvalue);
if (maxString != null) {
- long max = Long.parseLong(maxString);
- if (value > max) {
- throw new ConfigurationException("parameter ["+parameter+"] "
- +"exceeds maximum ["+max+"]");
+ try {
+ long max = numberFormat.parse(maxString).longValue();
+ if (value > max) {
+ throw new ConfigurationException("parameter ["+parameter+"] "
+ +"exceeds maximum ["+max+"]");
+ }
+ } catch (ParseException e) {
+ throw new NumberFormatException(
+ "Invalid maximum long for parameter: " + parameter);
+
}
}
if (minString != null) {
- long min = Long.parseLong(minString);
- if (value < min) {
- throw new ConfigurationException("parameter ["+parameter+"] "
- +"is less than manimum "
- +"["+min+"]");
- }
+ try {
+ long min = numberFormat.parse(minString).longValue();
+ if (value < min) {
+ throw new ConfigurationException("parameter ["+parameter+"] "
+ + "is less than manimum ["+min+"]");
+ }
+ } catch (ParseException e) {
+ throw new NumberFormatException(
+ "Invalid minimum long for parameter: " + parameter);
+ }
}
return value;
}
-
private static File getPropertiesPath() {
File rootDir = new File("/opt/bigdata"); //real installation
String appHome = System.getProperty("appHome");//pstart
@@ -372,30 +510,23 @@
}
private static void loadDefaultProps(Properties deployProps) {
- FileInputStream fis = null;
- try {
- File flnm = new File(getPropertiesPath(), "default-deploy.properties");
- fis = new FileInputStream(flnm);
- deployProps.load(fis);
- } catch (Exception ex) {
- ex.printStackTrace();
- } finally {
- if (fis != null) {
- try {
- fis.close();
- } catch (IOException ioex) { /* swallow */ }
- }
- }
+ loadPropsInternal("default-deploy.properties", deployProps, true);
}
private static void loadOverrideProps(Properties deployProps) {
+ loadPropsInternal("deploy.properties", deployProps, false);
+ }
+
+ private static void loadPropsInternal(String propFileName,
+ Properties deployProps, boolean prtinTrace)
+ {
FileInputStream fis = null;
try {
- File flnm = new File(getPropertiesPath(), "default-deploy.properties");
+ File flnm = new File(getPropertiesPath(), propFileName);
fis = new FileInputStream(flnm);
deployProps.load(fis);
} catch (Exception ex) {
- // using all defaults
+ if (prtinTrace) ex.printStackTrace();
} finally {
if (fis != null) {
try {
@@ -407,214 +538,51 @@
private static int str2int(String argx) {
- long l;
-
- if( argx.trim().equals(Integer.MAX_VALUE) ) return Integer.MAX_VALUE;
- if( argx.trim().equals(Integer.MIN_VALUE) ) return Integer.MIN_VALUE;
-
- l = str2long(argx);
- if (l < Integer.MAX_VALUE && l > Integer.MIN_VALUE) {
- return (int) l;
- } else {
- throw new NumberFormatException("Invalid number:"+argx
- +" --number out of range");
- }
+ Number n = null;
+ try {
+ //TODO - truncation can occur -- check for overflow
+ n = numberFormat.parse(argx);
+ } catch (ParseException e) {
+ throw new NumberFormatException("Invalid integer: " + argx);
+ }
+ return n.intValue();
}
private static long str2long(String argx) {
-
- int minDigitNumBetwnComma = 3;
-
- String arg = argx.trim();
- arg = arg.replaceAll("\"", ""); // strip all quotes
- int sz = arg.length();
-
- if( arg.equals("Long.MAX_VALUE") ) return Long.MAX_VALUE;
-
- if( arg.equals("Long.MIN_VALUE") ) return Long.MIN_VALUE;
-
- int asterPos = -1;
- String arg1 = null;
- String arg2 = null;
- if( (asterPos = arg.indexOf("*")) != -1) {
- int dotPos = -1;
- arg1 = arg.substring(0, asterPos).trim();
- int denom1 = 1;
- if( (dotPos = arg1.indexOf(".")) != -1) {
- StringBuffer tmpBuf = new StringBuffer("1");
- int hitNumber = 0;
- for (int i = dotPos + 1; i < (arg1.length() - dotPos); i++) {
- if( Character.isDigit(arg1.charAt(i)) ) {
- tmpBuf.append("0");
- } else {
- break;
- }
- }
- denom1 = Integer.valueOf(tmpBuf.toString());
- arg1 = arg1.substring(0, dotPos) + arg1.substring(dotPos + 1);
- }
-
- arg2 = arg.substring(asterPos + 1).trim();
- int denom2 = 1;
- if( (dotPos = arg2.indexOf(".")) != -1) {
- StringBuffer tmpBuf = new StringBuffer("1");
- for(int i = dotPos + 1; i <= (arg2.length() - dotPos); i++) {
- tmpBuf.append("0");
- }
-
- denom2 = Integer.valueOf(tmpBuf.toString());
- arg2 = arg2.substring(0, dotPos) + arg2.substring(dotPos + 1);
- }
-
- long numerator = str2long(arg1) * str2long(arg2);
- long denom = (denom1 * denom2);
-
- if (numerator % denom != 0) {
- throw new NumberFormatException(" Bad value passed in:" +
- ((double) (numerator) /
- denom) +
- ", expecting a long");
- }
- return (numerator / denom);
- }
-
- char unit = arg.charAt(sz - 1);
-
- String valScalar = arg.substring(0, (sz - 1)).trim();
-
- long factor = 0l;
-
- switch (Character.toUpperCase(unit)) {
-
- case 'G':
- factor = 1000000000l;
- break;
- case 'M':
- factor = 1000000l;
- break;
- case 'K':
- factor = 1000l;
- break;
- case 'B':
- char unitPre = arg.charAt(sz - 2);
- if (Character.isDigit(unitPre)) {
- factor = -1l;
- } else {
- factor =
- (Character.toUpperCase(unitPre) ==
- 'G' ? 1000000000l : (Character.toUpperCase(unitPre) ==
- 'M' ? 1000000l : (Character.
- toUpperCase
- (unitPre) ==
- 'K' ? 1000l :
- -1l)));
- valScalar = arg.substring(0, (sz - 2)).trim();
- }
- break;
-
- default:
- if (Character.isDigit(unit)) {
- factor = 1l;
- valScalar = arg;
- }
- }
- if (factor == -1l) {
- throw new NumberFormatException("Invalid number:" + arg);
- }
-
- int comaPos = -1;
- if( (comaPos = valScalar.indexOf(',')) != -1) {
- if(valScalar.indexOf('.') != -1) {
- throw new NumberFormatException("Invalid number:"+arg
- +" both \",\" and decimal "
- +"point are not supported");
- }
- if( comaPos != 0 && comaPos != (valScalar.length() - 1) ) {
- String[]spltByComa = valScalar.split(",");
- valScalar = "";
- for (int i = spltByComa.length - 1; i >= 0; i--) {
- if(i > 0 && spltByComa[i].length() < minDigitNumBetwnComma)
- {
- throw new NumberFormatException("Invalid number:"+arg
- +" unexpected comma "
- +"format");
- }
- valScalar = spltByComa[i] + valScalar;
- }
- } else {
- throw new NumberFormatException("Invalid number:\"" +arg
- +"\" -unexpected comma in "
- +"position: "+comaPos);
- }
- }
-
- int decimalPos = -1;
- String valMultiplByFactor = null;
- int numZero = 0;
- try {
- if( (decimalPos = valScalar.indexOf('.')) != -1) {
- if (decimalPos != valScalar.lastIndexOf('.')) {
- throw new NumberFormatException("Invalid number:"
- +valScalar
- +" --invalid decimal "
- +"number, bad value");
- }
-
- String facStr = String.valueOf(factor);
- int numZeroFactor = facStr.length() - 1;
- int numDigitsAfterDecimal =
- valScalar.length() - decimalPos - 1;
- int countZero = 0;
- for(int i = valScalar.length() - 1; i > decimalPos; i--) {
-
- if (valScalar.charAt(i) != '0')
- break;
- --numDigitsAfterDecimal;
- countZero++;
- }
- numZero = numZeroFactor - numDigitsAfterDecimal;
- if (numZero == numDigitsAfterDecimal) {
- numZero = 0;
- }
- if(numZero < 0) {
- throw new NumberFormatException("Invalid number:"
- +valScalar
- +" --invalid decimal "
- +"number, numzero="
- + numZero);
- }
-
- if(numZero >= 0) {
- StringBuffer tmpStrNum =
- new StringBuffer(20).
- append(valScalar.substring(0, decimalPos)).
- append(valScalar.substring(decimalPos + 1,
- decimalPos + 1 +
- numDigitsAfterDecimal));
- for(int i=0; i<numZero; i++) {
- tmpStrNum.append('0');
- }
- valMultiplByFactor = tmpStrNum.toString();
- }
-
- }
- } catch(NumberFormatException nfe) {
- throw new NumberFormatException("Invalid number:" +valScalar
- +" --invalid decimal number, "
- +"numZero="+numZero);
- }
-
- long ret = -1l;
-
- Long ll = ((decimalPos != -1) ? Long.valueOf(valMultiplByFactor)
- : (Long.valueOf(valScalar) * factor));
- if( (ret = Long.valueOf(ll)) >= Long.MAX_VALUE
- || ret <= Long.MIN_VALUE)
- {
- throw new NumberFormatException("Invalid number:"+arg
- +" --absolute value of number "
- +"too big");
- }
- return ret;
+ Number n = null;
+ try {
+ //TODO - truncation can occur -- check for overflow
+ n = numberFormat.parse(argx);
+ } catch (ParseException e) {
+ throw new NumberFormatException("Invalid long: " + argx);
+ }
+ return n.longValue();
}
+
+ /**
+ * Returns reference to <code>deploymenyProps</code> field. If null, then the
+ * field is populated by looking for the default and override properties files
+ * (defined in <code>loadDefaultProps</code> and <code>loadOverrideProps</code>).
+ * This method is synchronized in order to ensure that the returned reference is
+ * a singleton instance.
+ * Note: This method should be private, but is needed by the unit tests in order
+ * to access and modify the underlying <code>Properties</code> object.
+ * @return Properties instance containing the configuration properties.
+ */
+ synchronized static Properties getDeploymentProperties() {
+ if(deploymentProps == null) {
+ deploymentProps = new Properties();
+ loadDeployProps(deploymentProps);
+ }
+ return deploymentProps;
+ }
+
+ /**
+ * Convenience method intended for use by unit tests only.
+ * @param properties Sets <code>Properties</code> object
+ */
+ synchronized static void setDeploymentProperties(Properties properties) {
+ deploymentProps = properties;
+ }
+
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigurationUtil.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigurationUtil.java 2010-10-13 14:18:44 UTC (rev 3786)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/ConfigurationUtil.java 2010-10-13 15:08:24 UTC (rev 3787)
@@ -28,10 +28,10 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import com.sun.jini.config.ConfigUtil;
import net.jini.url.httpmd.HttpmdUtil;
import java.io.IOException;
+import java.net.UnknownHostException;
/**
* Utility class that provides a set of static convenience methods
@@ -43,6 +43,11 @@
* This class cannot be instantiated.
*/
public class ConfigurationUtil {
+
+ private ConfigurationUtil() {
+ //prevent instantiation
+ throw new AssertionError
+ ("ConfigurationUtil cannot be instantiated"); }
private static final Logger logger =
LogUtil.getLog4jLogger( ConfigurationUtil.class );
@@ -95,7 +100,7 @@
* <p>
* Note that the <code>name</code> parameter is handled specially by
* this method. The value input to that <code>String</code> parameter
- * is interpretted in one of two ways by this method:
+ * is interpreted in one of two ways by this method:
* <p><ul>
* <li> The name of the local <i>network interface</i> over which the
* class server will communicate with clients requesting the
@@ -109,7 +114,7 @@
* This method first treats the value of the <code>name</code> parameter
* as a network interface, attempting to determine that interface's
* corresponding IP address. Should that attempt fail, then this method
- * then assumes that the caller intended this parameter to be interpretted
+ * then assumes that the caller intended this parameter to be interpreted
* as an IP address or host name; in which case, this method uses
* the value of the parameter as the <i>address/host</i> component of
* codebase being constructed.
@@ -181,7 +186,7 @@
* any value, including <code>null</code>).
*
* @throws IllegalArgumentException if the value input for
- * <code>port</code> is negtive.
+ * <code>port</code> is negative.
*/
public static String computeCodebase(String name,
String jarFile,
@@ -220,6 +225,10 @@
logger.log(Level.TRACE, name+" - not a valid "
+"network interface, assuming host name");
}
+ if (ipAddr==null) {
+ throw new UnknownHostException(
+ "Could not determine IP address for given name:" + name);
+ }
// Construct the codebase, either httpmd or http
if(doHttpmd) {
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/Log4jLoggingHandler.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/config/Log4jLoggingHan...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X