Thread: [Bigdata-commit] SF.net SVN: bigdata:[3608] branches/bbb_cleanup

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3608
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3608&view=rev
Author:   resendes
Date:     2010-09-21 22:18:53 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
Merge from maven_scaleout branch.

Modified Paths:
--------------
    branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/build.properties
    branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties
    branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/build.properties
    branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties
    branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/build.properties
    branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/build.properties
    branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties
    branches/bbb_cleanup/bigdata-core/pom.xml
    branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/scripts/testStatisticsCollector.sh
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/Banner.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/BigdataStatics.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/AbstractBTree.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexMetadata.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentBuilder.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/IndexSegmentStore.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/btree/Node.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/BCHMGlobalLRU.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/BCHMGlobalLRU2.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/HardReferenceGlobalLRU.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/HardReferenceGlobalLRURecycler.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/HardReferenceGlobalLRURecyclerExplicitDeleteRequired.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/IGlobalLRU.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/StoreAndAddressLRUCache.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/WeakReferenceGlobalLRU.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/AbstractProcessCollector.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/httpd/DummyEventReportingService.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/linux/StatisticsCollectorForLinux.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/linux/SysstatUtil.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/win/StatisticsCollectorForWindows.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/AbstractJournal.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/DiskOnlyStrategy.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/TemporaryRawStore.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/journal/WORMStrategy.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/loadbalancer/EmbeddedLoadBalancer.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedShardLocator.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/AbstractRawStore.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/IRawStore.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rawstore/SimpleMemoryRawStore.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/AbstractFederation.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/AbstractService.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/DataService.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/DefaultClientDelegate.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/EmbeddedFederation.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/Event.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/IBigdataClient.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/LoadBalancerService.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/service/jini/AbstractServer.java
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/cache/StressTestGlobalLRU.xml
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/test.xml
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/AbstractIndexSegmentTestCase.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestAll_IndexSegment.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithCompactingMerge.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithIncrementalBuild.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithLargeTrees.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderWithSmallTree.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentWithBloomFilter.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestNullValues.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/StressTestGlobalLRU.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithStripedLocks.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithStripedLocksAndLIRS.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithThreadLocalBuffers.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRU2WithThreadLocalBuffersAndLIRS.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/cache/TestBCHMGlobalLRUWithLIRS.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/jini/start/config/TestServiceConfiguration.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/journal/AbstractRestartSafeTestCase.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/journal/TestAbort.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/rawstore/SimpleFileRawStore.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/rdf/store/AbstractTestCase.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/AbstractEmbeddedFederationTestCase.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/StressTestConcurrent.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/service/TestMove.java
    branches/bbb_cleanup/bigdata-integ/pom.xml
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/AbstractFedZooTestCase.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/JiniStartSuite.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestJiniCoreServicesProcessHelper.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestServiceConfigurationMonitoring.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestServiceConfigurationMonitoringRemote.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestServiceStarter.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/TestServiceStarterRemote.java
    branches/bbb_cleanup/pom.xml

Added Paths:
-----------
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/cache/LRUNexus.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/httpd/AbstractStatisticsCollector.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/config/JiniStartConfigSuite.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/config/TestServiceConfiguration.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/config/TestServiceConfigurationRemote.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/jini/start/config/TestZookeeperServerEntry.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/AbstractZooTestCase.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestHierarchicalZNodeWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestUnknownChildrenWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZLockImpl.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZNodeCreatedWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZNodeDeletedWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZooBarrier.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZooElection.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZooQueue.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZookeeperAccessor.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/ZookeeperSuite.java

Removed Paths:
-------------
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/LRUNexus.java
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/counters/AbstractStatisticsCollector.java
    branches/bbb_cleanup/bigdata-core/src/test/java/com/bigdata/btree/TestIndexSegmentBuilderCacheInteraction.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/AbstractZooTestCase.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestHierarchicalZNodeWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestUnknownChildrenWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZLockImpl.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZNodeCreatedWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZNodeDeletedWatcher.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZooBarrier.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZooElection.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZooQueue.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/TestZookeeperAccessor.java
    branches/bbb_cleanup/bigdata-integ/src/test/java/com/bigdata/zookeeper/ZookeeperSuite.java

Property Changed:
----------------
    branches/bbb_cleanup/
    branches/bbb_cleanup/bigdata-core/
    branches/bbb_cleanup/bigdata-core/bigdata-perf/
    branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources/
    branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL/
    branches/bbb_cleanup/bigdata-core/dsi-utils/lib/
    branches/bbb_cleanup/bigdata-core/dsi-utils/src/
    branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
    branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
    branches/bbb_cleanup/bigdata-core/osgi/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/bin/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
    branches/bbb_cleanup/bigdata-core/src/main/java/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util/
    branches/bbb_cleanup/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
    branches/bbb_cleanup/bigdata-core/src/test/java/


Property changes on: branches/bbb_cleanup
___________________________________________________________________
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/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438,3588-3607
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542


Property changes on: branches/bbb_cleanup/bigdata-core
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3499
   + /branches/maven_scaleout/bigdata-core:3588-3607
/trunk:3499


Property changes on: branches/bbb_cleanup/bigdata-core/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf:3379-3541
   + /branches/maven_scaleout/bigdata-core/bigdata-perf:3588-3607
/trunk/bigdata-perf:3379-3541

Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/build.properties
===================================================================

--- branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/build.properties	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/build.properties	2010-09-21 22:18:53 UTC (rev 3608)
@@ -182,13 +182,13 @@
 
 # The record cache (empty for the default cache).
 #cache=
-cache=-Dcom.bigdata.LRUNexus.enabled=false
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.LRUNexus.threadLocalBuffers=true
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.LRUNexus.limitingCapacity=2000000
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
+cache=-Dcom.bigdata.cache.LRUNexus.enabled=false
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.cache.LRUNexus.threadLocalBuffers=true
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.cache.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.cache.LRUNexus.limitingCapacity=2000000
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
 #
-##  -Dcom.bigdata.LRUNexus.percentHeap=.1
+##  -Dcom.bigdata.cache.LRUNexus.percentHeap=.1
 
 # all jvm args for query.
 queryJvmArgs=-server -Xmx${bsbm.maxMem} ${gcopts} ${gcdebug} ${profiler} ${cache} -Dlog4j.configuration=log4j.properties

Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/bsbm/src/resources/logging/log4j.properties	2010-09-21 22:18:53 UTC (rev 3608)
@@ -13,7 +13,7 @@
 # Note: logging here at INFO or DEBUG will significantly impact throughput!
 #log4j.logger.com.bigdata=INFO
 
-log4j.logger.com.bigdata.LRUNexus=INFO
+log4j.logger.com.bigdata.cache.LRUNexus=INFO
 #log4j.logger.com.bigdata.rdf.sail.BigdataSail=INFO
 #log4j.logger.com.bigdata.rdf.sail.BigdataEvaluationStrategyImpl2=INFO
 

Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/build.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/build.properties	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/build.properties	2010-09-21 22:18:53 UTC (rev 3608)
@@ -61,11 +61,11 @@
 
 # The record cache (empty for the default cache).
 #cache=
-cache=-Dcom.bigdata.LRUNexus.enabled=false
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.LRUNexus.threadLocalBuffers=true
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.LRUNexus.limitingCapacity=2000000
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
+cache=-Dcom.bigdata.cache.LRUNexus.enabled=false
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.cache.LRUNexus.threadLocalBuffers=true
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.cache.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.cache.LRUNexus.limitingCapacity=2000000
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
 
 # all jvm args for query.
 queryJvmArgs=-server -Xmx${maxMem} ${gcopts} ${gcdebug} ${profiler} ${cache} -Dlog4j.configuration=file:src/resources/logging/log4j.properties

Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/btc/src/resources/logging/log4j.properties	2010-09-21 22:18:53 UTC (rev 3608)
@@ -13,7 +13,7 @@
 # Note: logging here at INFO or DEBUG will significantly impact throughput!
 #log4j.logger.com.bigdata=INFO
 
-log4j.logger.com.bigdata.LRUNexus=INFO
+log4j.logger.com.bigdata.cache.LRUNexus=INFO
 #log4j.logger.com.bigdata.rdf.sail.BigdataSail=INFO
 #log4j.logger.com.bigdata.rdf.sail.BigdataEvaluationStrategyImpl2=INFO
  

Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/build.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/build.properties	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/build.properties	2010-09-21 22:18:53 UTC (rev 3608)
@@ -129,11 +129,11 @@
 
 # The record cache (empty for the default cache).
 #cache=
-cache=-Dcom.bigdata.LRUNexus.enabled=false
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.LRUNexus.threadLocalBuffers=true
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.LRUNexus.limitingCapacity=2000000
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
+cache=-Dcom.bigdata.cache.LRUNexus.enabled=false
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.cache.LRUNexus.threadLocalBuffers=true
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.cache.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.cache.LRUNexus.limitingCapacity=2000000
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
 
 # all jvm args for query.
 queryJvmArgs=-server -Xmx${lubm.maxMem} ${gcopts} ${gcdebug} ${profiler} ${cache} -Dlog4j.configuration=log4j.properties


Property changes on: branches/bbb_cleanup/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-3541
   + /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources:3588-3607
/trunk/bigdata-perf/lubm/src/resources:3379-3541

Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/build.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/build.properties	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/build.properties	2010-09-21 22:18:53 UTC (rev 3608)
@@ -60,11 +60,11 @@
 
 # The record cache (empty for the default cache).
 #cache=
-cache=-Dcom.bigdata.LRUNexus.enabled=false
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.LRUNexus.threadLocalBuffers=true
-#cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.LRUNexus.limitingCapacity=2000000
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
-#-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
+cache=-Dcom.bigdata.cache.LRUNexus.enabled=false
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.cache.LRUNexus.threadLocalBuffers=true
+#cache=-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.cache.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.cache.LRUNexus.limitingCapacity=2000000
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache
+#-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
 
 # all jvm args for query.
 queryJvmArgs=-server -Xmx${maxMem} ${gcopts} ${gcdebug} ${profiler} ${cache} -Dlog4j.configuration=file:src/resources/logging/log4j.properties

Modified: branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties
===================================================================
--- branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/bigdata-perf/uniprot/src/resources/logging/log4j.properties	2010-09-21 22:18:53 UTC (rev 3608)
@@ -13,7 +13,7 @@
 # Note: logging here at INFO or DEBUG will significantly impact throughput!
 #log4j.logger.com.bigdata=INFO
 
-log4j.logger.com.bigdata.LRUNexus=INFO
+log4j.logger.com.bigdata.cache.LRUNexus=INFO
 #log4j.logger.com.bigdata.rdf.sail.BigdataSail=INFO
 #log4j.logger.com.bigdata.rdf.sail.BigdataEvaluationStrategyImpl2=INFO
  


Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/LEGAL:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL:3588-3607
/trunk/dsi-utils/LEGAL:3379-3430,3499


Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/lib:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/dsi-utils/lib:3588-3607
/trunk/dsi-utils/lib:3379-3430,3499


Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/src:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/dsi-utils/src:3588-3607
/trunk/dsi-utils/src:3379-3430,3499


Property changes on: branches/bbb_cleanup/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,3499
   + /branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3607
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499


Property changes on: branches/bbb_cleanup/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,3499
   + /branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3607
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499


Property changes on: branches/bbb_cleanup/bigdata-core/osgi
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/osgi:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/osgi:3588-3607
/trunk/osgi:3379-3430,3499

Modified: branches/bbb_cleanup/bigdata-core/pom.xml
===================================================================
--- branches/bbb_cleanup/bigdata-core/pom.xml	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/pom.xml	2010-09-21 22:18:53 UTC (rev 3608)
@@ -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>
@@ -28,10 +27,8 @@
                 <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>
@@ -89,12 +86,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <!-- TODO: BLECH!  All the tests are excluded from the regular unit test phase.
-                         TODO: Need to split out the unit tests and the heavier integration tests, plus
-                         TODO: get all the unit tests passing so regressions can properly fail the build.
+                    <!--
+                        TODO: BLECH! All the tests are excluded from the regular unit test phase. TODO: Need to split out the unit tests and the heavier integration tests, plus TODO: get all the unit
+                        tests passing so regressions can properly fail the build.
                     -->
                     <testFailureIgnore>true</testFailureIgnore>
-                    <includes/>
+                    <includes />
                     <excludes>
                         <exclude>**/*</exclude>
                     </excludes>
@@ -102,8 +99,8 @@
             </plugin>
 
             <plugin>
-                <!-- These are where the heavier tests can be run.  Right now failsafe looks for tests starting or ending
-                     with IT,  aka  FooIT.java or ITFoo.java, which don't exist yet, so nothing runs.
+                <!--
+                    These are where the heavier tests can be run. Right now failsafe looks for tests starting or ending with IT, aka FooIT.java or ITFoo.java, which don't exist yet, so nothing runs.
                 -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -201,14 +198,14 @@
 
     <dependencies>
 
-       
 
+
         <!-- ************************ Start of non-public dependencies ************************ -->
         <!-- ************************ Start of non-public dependencies ************************ -->
         <!-- ************************ Start of non-public dependencies ************************ -->
 
         <!-- TODO: look at maven-bundle-plugin from felix to provide osgi support.  bndlib version 0.0.357 in central. -->
-        
+
         <dependency>
             <groupId>${thirdParty.groupId}</groupId>
             <artifactId>cweb-extser</artifactId>
@@ -230,7 +227,7 @@
             <groupId>${thirdParty.groupId}</groupId> <!-- TODO: An older version (5.0.9) is available in central. -->
             <artifactId>unimi-fastutil</artifactId>
             <version>5.1.5</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>${thirdParty.groupId}</groupId>
             <artifactId>lgpl-utils</artifactId>
@@ -246,22 +243,22 @@
             <artifactId>dsi-utils</artifactId>
             <version>1.0.6-020610</version>
         </dependency>
-        <dependency>                           
+        <dependency>
             <groupId>${thirdParty.groupId}</groupId>
             <artifactId>high-scale-lib</artifactId>
             <version>1.1.2</version>
         </dependency>
         <dependency>
-            <groupId>${thirdParty.groupId}</groupId>                        
+            <groupId>${thirdParty.groupId}</groupId>
             <artifactId>iris</artifactId>
             <version>0.58</version>
         </dependency>
         <dependency>
-            <groupId>${thirdParty.groupId}</groupId>                                    
+            <groupId>${thirdParty.groupId}</groupId>
             <artifactId>nxparser</artifactId>
             <version>6-22-2010</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>zookeeper</artifactId>
@@ -312,7 +309,7 @@
         <dependency>
             <groupId>org.apache.river</groupId>
             <artifactId>browser</artifactId>
-            <version>2.1</version>            
+            <version>2.1</version>
         </dependency>
 
         <!-- Note that these are dl jars, so they are provided and have a dl classifier. -->
@@ -397,10 +394,9 @@
             <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>
@@ -551,10 +547,37 @@
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
-        </dependency>                                        
-        
+        </dependency>
+
     </dependencies>
 
+    <reporting>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.5</version>
+            </plugin>
+
+            <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>
+
     <profiles>
         <profile>
             <id>bigdata-clover</id>
@@ -579,7 +602,7 @@
                         </configuration>
                     </plugin>
                 </plugins>
-            </build>            
+            </build>
         </profile>
     </profiles>
 


Property changes on: branches/bbb_cleanup/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,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/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
/branches/maven_scaleout/bigdata-core/src/main/deploy/bin:3588-3607
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Modified: branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/scripts/testStatisticsCollector.sh
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/scripts/testStatisticsCollector.sh	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/src/main/deploy/legacy/scripts/testStatisticsCollector.sh	2010-09-21 22:18:53 UTC (rev 3608)
@@ -4,11 +4,11 @@
 #
 # usage: [interval [count]]
 #
-# See com.bigdata.counters.AbstractStatisticsCollector#main(String[])
+# See com.bigdata.counters.httpd.AbstractStatisticsCollector#main(String[])
 
 source `dirname $0`/bigdataenv
 
 java ${JAVA_OPTS} \
 	-cp ${CLASSPATH} \
-    com.bigdata.counters.AbstractStatisticsCollector \
+    com.bigdata.counters.httpd.AbstractStatisticsCollector \
     $*


Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
   + /branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini:3588-3607
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528

Modified: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config	2010-09-21 22:18:53 UTC (rev 3608)
@@ -629,15 +629,15 @@
 	
       	"jini",
 	"org.apache.zookeeper.server.quorum.QuorumPeerMain",
-//BTM	"com.bigdata.service.jini.TransactionServer",
-//BTM  	"com.bigdata.service.jini.MetadataServer",
+	    "com.bigdata.service.jini.TransactionServer",
+      	"com.bigdata.service.jini.MetadataServer",
     	"com.bigdata.service.jini.DataServer",
-//BTM  	"com.bigdata.service.jini.LoadBalancerServer",
+      	"com.bigdata.service.jini.LoadBalancerServer",
     	"com.bigdata.service.jini.ClientServer",
 
-"com.bigdata.transaction.ServiceImpl",
-"com.bigdata.metadata.ServiceImpl",
-"com.bigdata.loadbalancer.ServiceImpl"
+//BTM "com.bigdata.transaction.ServiceImpl",
+//BTM "com.bigdata.metadata.ServiceImpl",
+//BTM "com.bigdata.loadbalancer.ServiceImpl"
 	
     };
 


Property changes on: branches/bbb_cleanup/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,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/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
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3607
/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/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster16.config	2010-09-21 22:18:53 UTC (rev 3608)
@@ -322,15 +322,15 @@
 	/*
 	 * Override the LRU buffer capacity.
 	 *
-	 * See com.bigdata.LRUNexus.Options for configuration info.  Note that if
+	 * See com.bigdata.cache.LRUNexus.Options for configuration info.  Note that if
 	 * you disable the LRUNexus you will loose the leaf cache for the index
 	 * segments, which is a big penalty.
-	//"-Dcom.bigdata.LRUNexus.enabled=false",
+	//"-Dcom.bigdata.cache.LRUNexus.enabled=false",
 	// option may be used to select the higher throughput impl.
-	"-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecyclerExplicitDeleteRequired",
+	"-Dcom.bigdata.cache.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecyclerExplicitDeleteRequired",
 	// option may be used to allocate more heap to the LRUNexus.
-	"-Dcom.bigdata.LRUNexus.percentHeap=.2",
-	"-Dcom.bigdata.LRUNexus.indexSegmentBuildPopulatesCache=true", // default true
+	"-Dcom.bigdata.cache.LRUNexus.percentHeap=.2",
+	"-Dcom.bigdata.cache.LRUNexus.indexSegmentBuildPopulatesCache=true", // default true
 	 */
     };
 


Property changes on: branches/bbb_cleanup/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,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/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,3588-3607
/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/bbb_cleanup/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,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/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
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3607
/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/bbb_cleanup/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,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/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
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging:3588-3607
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542


Property changes on: branches/bbb_cleanup/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,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/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
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3607
/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/bbb_cleanup/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,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/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
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3607
/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/bbb_cleanup/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/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/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
/branches/maven_scaleout/bigdata-core/src/main/java:3588-3607
/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/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/Banner.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/Banner.java	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/Banner.java	2010-09-21 22:18:53 UTC (rev 3608)
@@ -31,12 +31,12 @@
 import java.lang.reflect.Method;
 import java.util.Date;
 
+import com.bigdata.util.config.ConfigDeployUtil;
+import com.bigdata.util.config.NicUtil;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.system.SystemUtil;
 
-import com.bigdata.counters.AbstractStatisticsCollector;
-
 /**
  * Class has a static method which writes a copyright banner on stdout once per
  * JVM. This method is invoked from several core classes in order to ensure that
@@ -48,6 +48,17 @@
 public class Banner {
 
     private static boolean didBanner;
+    private static final String HOSTNAME;
+    static {
+        String val;
+        try {
+            val = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
+        } catch(Throwable t) {//for now, maintain same failure logic as used previously
+            t.printStackTrace();
+            val = NicUtil.getIpAddressByLocalHost();
+        }
+        HOSTNAME = val;
+    }
 
     /**
      * Environment variables understood by the {@link Banner} class.
@@ -153,7 +164,7 @@
         "\n"+//
         "\nCopyright SYSTAP, LLC 2006-2010.  All rights reserved."+//
         "\n"+//
-        "\n"+AbstractStatisticsCollector.fullyQualifiedHostName+//
+        "\n"+HOSTNAME+//
         "\n"+new Date()+//
         "\n"+SystemUtil.operatingSystem() + "/" + SystemUtil.osVersion()
                 + " " + SystemUtil.architecture() + //

Modified: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/BigdataStatics.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/BigdataStatics.java	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/BigdataStatics.java	2010-09-21 22:18:53 UTC (rev 3608)
@@ -27,7 +27,6 @@
 
 package com.bigdata;
 
-import com.bigdata.jini.start.process.ProcessHelper;
 
 /**
  * A class for those few statics that it makes sense to reference from other
@@ -50,9 +49,9 @@
      * {@link System#out} when that child process is executed. This makes it
      * easy to track down why a child process dies during service start. If you
      * want to see more output from the child process, then you should set the
-     * log level for the {@link ProcessHelper} class to INFO.
+     * log level for the {@link com.bigdata.jini.start.process.ProcessHelper} class to INFO.
      * 
-     * @see ProcessHelper
+     * @see com.bigdata.jini.start.process.ProcessHelper
      */
     public static int echoProcessStartupLineCount = 20;
     

Deleted: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/LRUNexus.java
===================================================================
--- branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/LRUNexus.java	2010-09-21 20:49:50 UTC (rev 3607)
+++ branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/LRUNexus.java	2010-09-21 22:18:53 UTC (rev 3608)
@@ -1,950 +0,0 @@
-/*
-
-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 Sep 8, 2009
- */
-
-package com.bigdata;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryPoolMXBean;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
-
-import org.apache.log4j.Logger;
-
-import com.bigdata.io.BytesUtil;
-import com.bigdata.btree.IndexMetadata;
-import com.bigdata.btree.IndexSegment;
-import com.bigdata.btree.IndexSegmentBuilder;
-import com.bigdata.cache.BCHMGlobalLRU;
-import com.bigdata.cache.BCHMGlobalLRU2;
-import com.bigdata.cache.HardReferenceGlobalLRU;
-import com.bigdata.cache.HardReferenceGlobalLRURecycler;
-import com.bigdata.cache.HardReferenceGlobalLRURecyclerExplicitDeleteRequired;
-import com.bigdata.cache.IGlobalLRU;
-import com.bigdata.cache.WeakReferenceGlobalLRU;
-import com.bigdata.cache.IGlobalLRU.ILRUCache;
-import com.bigdata.journal.AbstractJournal;
-import com.bigdata.journal.IBufferStrategy;
-import com.bigdata.journal.TemporaryRawStore;
-import com.bigdata.rawstore.AbstractRawStore;
-import com.bigdata.rawstore.Bytes;
-import com.bigdata.rawstore.IAddressManager;
-import com.bigdata.rawstore.IRawStore;
-import com.bigdata.rawstore.WormAddressManager;
-
-/**
- * Static singleton factory used to configure the record level cache behavior
- * for bigdata within the current JVM. The configuration is specified using
- * system properties defined by {@link Options}.
- * 
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- * 
- * ...
 
[truncated message content]

Thread: [Bigdata-commit] SF.net SVN: bigdata:[3608] branches/bbb_cleanup

Fast, scalable, robust graph database platform

bigdata-commit