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] |