Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3691] branches/maven_scaleout/bigdata-core
|
From: <res...@us...> - 2010-09-30 13:43:39
|
Revision: 3691
http://bigdata.svn.sourceforge.net/bigdata/?rev=3691&view=rev
Author: resendes
Date: 2010-09-30 13:43:30 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
Merge (back) from bbb_cleanup branch -- fixes for com.bigdata.util package
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/BootStateUtil.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/EntryUtil.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/Format.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/HTMLUtility.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/InnerCause.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/MillisecondTimestampFactory.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/NT.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/NV.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ReverseLongComparator.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestCSVReader.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestInnerCause.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestMillisecondTimestampFactory.java
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/build/
branches/maven_scaleout/bigdata-core/build/classes/
branches/maven_scaleout/bigdata-core/src/META-INF/
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/CSVReaderBuilder.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestBootStateUtil.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestEntryUtil.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestFormat.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestHTMLUtility.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestNT.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestNV.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestReverseLongComparator.java
Removed Paths:
-------------
branches/maven_scaleout/bigdata-core/build/classes/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ByteBufferBitVector.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ChecksumError.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ClassLoaderUtil.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/HybridTimestampFactory.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/NanosecondTimestampFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestByteBufferBitVector.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestHybridTimestampFactory.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/util/TestNanosecondTimestampFactory.java
Property Changed:
----------------
branches/maven_scaleout/bigdata-core/
branches/maven_scaleout/bigdata-core/bigdata-perf/
branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources/
branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL/
branches/maven_scaleout/bigdata-core/dsi-utils/lib/
branches/maven_scaleout/bigdata-core/dsi-utils/src/
branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/maven_scaleout/bigdata-core/osgi/
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/main/java/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/
branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/
Property changes on: branches/maven_scaleout/bigdata-core
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3499
+ /branches/bbb_cleanup/bigdata-core:3588-3690
/trunk:3499
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/bigdata-perf:3379-3541
+ /branches/bbb_cleanup/bigdata-core/bigdata-perf:3588-3690
/trunk/bigdata-perf:3379-3541
Property changes on: branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/trunk/bigdata-perf/lubm/src/resources:3379-3541
+ /branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources:3588-3690
/branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/trunk/bigdata-perf/lubm/src/resources:3379-3541
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dsi-utils/LEGAL:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL:3588-3690
/trunk/dsi-utils/LEGAL:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dsi-utils/lib:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/lib:3588-3690
/trunk/dsi-utils/lib:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dsi-utils/src:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/dsi-utils/src:3588-3690
/trunk/dsi-utils/src:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3690
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/osgi
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/osgi:3379-3430,3499
+ /branches/bbb_cleanup/bigdata-core/osgi:3588-3690
/trunk/osgi:3379-3430,3499
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/bin:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
+ /branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini:3588-3690
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bbb_cleanup/bigdata-core/src/main/java:3588-3690
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr:3588-3690
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco:3588-3690
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench:3588-3690
/branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
+ /branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util:3588-3690
/branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/BootStateUtil.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/BootStateUtil.java 2010-09-30 11:47:53 UTC (rev 3690)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/BootStateUtil.java 2010-09-30 13:43:30 UTC (rev 3691)
@@ -45,7 +45,6 @@
import com.sun.jini.config.Config;
import net.jini.config.Configuration;
import net.jini.config.ConfigurationException;
-import net.jini.config.NoSuchEntryException;
import net.jini.core.lookup.ServiceID;
/**
@@ -80,7 +79,7 @@
private File persistenceDir = null;
private UUID proxyId = null;
private ServiceID serviceId = null;
- private String stateKey = null;
+ private String stateKey = null; //TODO -- not used?
public BootStateUtil(final Configuration config,
final String componentName,
@@ -128,22 +127,6 @@
recoverBootState(defaultServiceId);
}
-
- public BootStateUtil(File persistenceDir,
- Class entityImplType,
- ServiceID defaultServiceId)
- throws IOException, ClassNotFoundException
- {
- if(entityImplType == null) {
- throw new NullPointerException("entityImplType null");
- }
- this.entityImplType = entityImplType;
- this.logger = Logger.getLogger(this.getClass());
- this.persistenceDir = persistenceDir;
-
- recoverBootState(defaultServiceId);
- }
-
/**
* Returns the entity's unique <i>proxy id</i> that is generated/recoverd
* as part of the boot state maintained by this class.
@@ -161,44 +144,6 @@
return serviceId;
}
- /**
- * Returns the <code>String</code> representing the path of the
- * directory in which the entity's <i>boot state</i> is located.
- * If the value returned is <code>null</code>, then the entity
- * was configured to run in <i>transient</i> mode.
- */
- public String getPersistenceDirectory() {
- return (persistenceDir != null) ? persistenceDir.toString() : null;
- }
-
- /**
- * Returns the <code>true</code> if the entity was configured to
- * run in <i>persistent</i> mode; <code>false</code> otherwise.
- */
- public boolean isPersistent() {
- return (persistenceDir != null);
- }
-
- /**
- * If the entity is currently configured to run in <i>persistent</i>
- * mode, returns the name-based key under which an entity's (non-boot)
- * state was persisted during previous runs of the entity. If the
- * entity is currently configured to run in <i>transient</i> mode,
- * a non-<code>null</code>, randomly-generated key value is returned.
- */
- public String getStateKey() {
- return stateKey;
- }
-
- /**
- * Returns the <code>Class</code> type of the entity whose boot state
- * is associated with the current instance of this utility.
- */
- public Class getType() {
- return entityImplType;
- }
-
-
/* Performs the actual retrieval of the entity's boot state. This
* method is called only once, in this utility's constructor.
* It recovers the entity's boot state from local persistence storage,
@@ -338,6 +283,7 @@
/**
* @see java.io.ObjectInputStream#resolveClass
*/
+ @Override
protected Class<?> resolveClass(ObjectStreamClass desc)
throws IOException, ClassNotFoundException
{
@@ -354,7 +300,7 @@
* An interface is specified here to support evolution of new
* versions of BootState.
*/
- interface BootState {
+ private interface BootState {
Class getType();
UUID getProxyId();
String getKey();
Deleted: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ByteBufferBitVector.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ByteBufferBitVector.java 2010-09-30 11:47:53 UTC (rev 3690)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ByteBufferBitVector.java 2010-09-30 13:43:30 UTC (rev 3691)
@@ -1,167 +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 Aug 6, 2009
- */
-
-package com.bigdata.util;
-
-import it.unimi.dsi.bits.AbstractBitVector;
-
-import java.nio.ByteBuffer;
-
-import cern.colt.bitvector.BitVector;
-
-/**
- * Wraps a {@link ByteBuffer} as a read-only {@link BitVector}.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
-public class ByteBufferBitVector extends AbstractBitVector {
-
- /**
- * The {@link ByteBuffer} containing the backing data.
- */
- final private ByteBuffer b;
-
- /**
- * The #of bits in the vector.
- */
- private final long len;
-
- /**
- * The bit offset into the {@link ByteBuffer} of the first bit in the
- * vector.
- */
- private final long off;
-
- final public long length() {
-
- return len;
-
- }
-
- /**
- * Ctor assumes that all bits in the buffer are used.
- *
- * @param b
- * The buffer.
- */
- public ByteBufferBitVector(final ByteBuffer b) {
-
- this(b, 0/* offset */, b == null ? 0 : b.capacity() * 8/* len */);
-
- }
-
- /**
- *
- * @param b
- * The buffer.
- * @param off
- * The offset from the start of the buffer for the view.
- * @param len
- * The #of bits which will be included in the view.
- */
- public ByteBufferBitVector(final ByteBuffer b, final long off,
- final long len) {
-
- if (b == null)
- throw new IllegalArgumentException();
-
- if (len < 0)
- throw new IllegalArgumentException();
-
- if (len < 0)
- throw new IllegalArgumentException();
-
- if (off + len > b.capacity() * 8L)
- throw new IllegalArgumentException();
-
- this.b = b;
-
- this.len = len;
-
- this.off = off;
-
- }
-
- /**
- * Return the index of the byte in which the bit with the given index is
- * encoded.
- *
- * @param bitIndex
- * The bit index.
- *
- * @return The byte index.
- */
- final protected int byteIndexForBit(final long bitIndex) {
-
- return ((int) ((bitIndex + off) / 8));
-
- }
-
- /**
- * Return the offset within the byte in which the bit is coded of the bit
- * (this is just the remainder <code>bitIndex % 8</code>).
- *
- * @param bitIndex
- * The bit index into the byte[].
- *
- * @return The offset of the bit in the appropriate byte.
- */
- final protected int withinByteIndexForBit(final long bitIndex) {
-
- return (int) ((bitIndex + off) % 8);
-
- }
-
- /**
- * Extract and return a bit coded flag.
- *
- * @param offset
- * The offset in the buffer of the start of the byte[] sequence
- * in which the bit coded flags are stored.
- * @param index
- * The index of the bit.
- *
- * @return The value of the bit.
- */
- public boolean getBoolean(final long index) {
-
- if (index < 0 || index >= len)
- throw new IndexOutOfBoundsException();
-
- return (b.get(byteIndexForBit(index)) & (1 << withinByteIndexForBit(index))) != 0;
-
- }
-
-// // @todo override for mutation.
-// public boolean set(final long index, final boolean value) {
-//
-// throw new UnsupportedOperationException();
-//
-// }
-
-}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java 2010-09-30 11:47:53 UTC (rev 3690)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/CSVReader.java 2010-09-30 13:43:30 UTC (rev 3691)
@@ -93,10 +93,8 @@
private final String name;
- public String getName() {
-
- return name;
-
+ public String getName() {
+ return name;
}
/**
@@ -227,25 +225,29 @@
}
/**
- * Equal if the headers have the same data.
+ * Equal if the headers have the same name.
*/
- public boolean equals(Header o) {
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof Header))
+ return false;
+
+ Header h = (Header)o;
- if(this==o) return true;
-
- return name.equals(o.name);
-
+ return name.equals(h.name);
}
/**
* Based on the header name.
*/
+ @Override
public int hashCode() {
return name.hashCode();
}
+ @Override
public String toString() {
return name;
@@ -289,7 +291,7 @@
* The header definitions (initially null).
*
* @see #readHeaders()
- * @see #setHeaders(String[])
+ * @see #setHeaders(Header[])
*/
protected Header[] headers;
@@ -324,54 +326,54 @@
}
- public boolean setSkipCommentLines(boolean skipCommentLines) {
+// public boolean setSkipCommentLines(boolean skipCommentLines) {
+//
+// boolean tmp = this.skipCommentLines;
+//
+// this.skipCommentLines = skipCommentLines;
+//
+// return tmp;
+//
+// }
+//
+// public boolean getSkipCommentLines() {
+//
+// return skipCommentLines;
+//
+// }
- boolean tmp = this.skipCommentLines;
+// public boolean setSkipBlankLines(boolean skipBlankLines) {
+//
+// boolean tmp = this.skipBlankLines;
+//
+// this.skipBlankLines = skipBlankLines;
+//
+// return tmp;
+//
+// }
+//
+// public boolean getSkipBlankLines() {
+//
+// return skipBlankLines;
+//
+// }
- this.skipCommentLines = skipCommentLines;
+// public boolean setTrimWhitespace(boolean trimWhitespace) {
+//
+// boolean tmp = this.trimWhitespace;
+//
+// this.trimWhitespace = trimWhitespace;
+//
+// return tmp;
+//
+// }
+//
+// public boolean getTrimWhitespace() {
+//
+// return trimWhitespace;
+//
+// }
- return tmp;
-
- }
-
- public boolean getSkipCommentLines() {
-
- return skipCommentLines;
-
- }
-
- public boolean setSkipBlankLines(boolean skipBlankLines) {
-
- boolean tmp = this.skipBlankLines;
-
- this.skipBlankLines = skipBlankLines;
-
- return tmp;
-
- }
-
- public boolean getSkipBlankLines() {
-
- return skipBlankLines;
-
- }
-
- public boolean setTrimWhitespace(boolean trimWhitespace) {
-
- boolean tmp = this.trimWhitespace;
-
- this.trimWhitespace = trimWhitespace;
-
- return tmp;
-
- }
-
- public boolean getTrimWhitespace() {
-
- return trimWhitespace;
-
- }
-
/**
* The #of milliseconds that the {@link CSVReader} should wait before
* attempting to read another line from the source (when reading from
@@ -505,8 +507,7 @@
}
/**
- * Trim whitespace and optional quotes from each value iff
- * {@link #getTrimWhitespace()} is true.
+ * Trim whitespace and optional quotes.
*
* @param cols
* The column values.
@@ -651,7 +652,7 @@
*/
public Header[] getHeaders() {
- return headers.clone();
+ return ((headers==null)? null : headers.clone());
}
@@ -679,7 +680,7 @@
*/
public void setHeader(int index,Header header) {
- if (index < 0 || index > headers.length)
+ if (index < 0 || index >= headers.length)
throw new IndexOutOfBoundsException();
if (header == null)
@@ -688,7 +689,7 @@
headers[index] = header;
}
-
+
/**
* Unsupported operation.
*/
Deleted: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ChecksumError.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ChecksumError.java 2010-09-30 11:47:53 UTC (rev 3690)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ChecksumError.java 2010-09-30 13:43:30 UTC (rev 3691)
@@ -1,46 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2007. All rights reserved.
-
-Contact:
- SYSTAP, LLC
- 4501 Tower Road
- Greensboro, NC 27410
- lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-/*
- * Created on Nov 5, 2006
- */
-
-package com.bigdata.util;
-
-/**
- * Exception thrown when the checksum field does not match the checksum computed
- * for the data being read. This is a serious error and indicates bad logic
- * and/or corrupt data.
- *
- * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
- */
-public class ChecksumError extends RuntimeException {
-
- private static final long serialVersionUID = -9067118459184074756L;
-
- public ChecksumError(String msg) {
- super( msg );
- }
-
-}
\ No newline at end of file
Deleted: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ClassLoaderUtil.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ClassLoaderUtil.java 2010-09-30 11:47:53 UTC (rev 3690)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/ClassLoaderUtil.java 2010-09-30 13:43:30 UTC (rev 3691)
@@ -1,328 +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
-
-*/
-
-package com.bigdata.util;
-
-import com.bigdata.util.config.LogUtil;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-
-import java.lang.reflect.Method;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.activation.ActivationException;
-import java.rmi.activation.ActivationID;
-
-import java.security.SecureClassLoader;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.StringTokenizer;
-
-import net.jini.io.MarshalledInstance;
-import net.jini.loader.ClassAnnotation;
-
-/**
- * This class provides useful utilities for creating and manipulating
- * class loaders. Although it can be used for other purposes, it is
- * generally intended for debugging.
- */
-public class ClassLoaderUtil {
-
- /** Configure logger */
- private static Logger logger =
- LogUtil.getLog4jLogger(ClassLoaderUtil.class);
-
- // Private constructor to prevent instantiation
- private ClassLoaderUtil() { }
-
- /**
- * Utility method that converts the components of a <code>String</code>
- * representing a classpath into file <code>URL</code>(s).
- *
- * @param classpath <code>String</code> containing components separated
- * by path separators that represent the components
- * making up a classpath
- *
- * @return a <code>URL[]</code> where
- * each element of the array corresponds to one of the components
- * in the <code>classpath</code> parameter. The path components
- * are (potentially) expanded via
- * <code>File.getCanonicalFile()</code> before converting to a
- * <code>URL</code> format.
- *
- * @throws java.net.MalformedURLException
- * If the path cannot be parsed as a URL
- * @throws java.net.IOException
- * If an I/O error occurs,
- * which is possible because the construction of
- * the canonical pathname may require filesystem queries
- */
- public static URL[] getClasspathURLs(String classpath)
- throws IOException, MalformedURLException
- {
- StringTokenizer st = new StringTokenizer(classpath,File.pathSeparator);
- URL[] urls = new URL[st.countTokens()];
- for (int i=0; st.hasMoreTokens(); i++) {
- urls[i] =
- new File(st.nextToken()).getCanonicalFile().toURI().toURL();
- }
- return urls;
- }
-
- /**
- * Utility method that converts the components of a <code>String</code>
- * representing a codebase into standard <code>URL</code>(s).
- *
- * @param codebase <code>String</code> containing components separated
- * by spaces in which each component is in
- * <code>URL</code> format.
- *
- * @return a <code>URL[]</code> where
- * each element of the array corresponds to one of the components
- * in the <code>codebase</code> parameter
- *
- * @throws java.net.MalformedURLException
- */
- public static URL[] getCodebaseURLs(String codebase)
- throws MalformedURLException
- {
- StringTokenizer st = new StringTokenizer(codebase);
- URL[] urls = new URL[st.countTokens()];
- for (int i=0; st.hasMoreTokens(); i++) {
- urls[i] = new URL(st.nextToken());
- }
- return urls;
- }
-
- /**
- * Utility method that converts the components of a <code>String</code>
- * representing a codebase or classpath into <code>URL</code>(s).
- *
- * @param importCodebase <code>String</code> assumed (in order) to be
- * either
- * 1) a space delimited set of <code>URL</code>(s)
- * representing a codebase or
- * 2) a <code>File.pathSeparator</code> delimited set
- * of class paths.
- *
- * @return a <code>URL[]</code> where
- * each element of the array corresponds to one of the components
- * in the <code>importCodebase</code> parameter
- *
- * @throws java.net.MalformedURLException
- * If the path cannot be parsed as a URL
- * @throws java.net.IOException
- * If an I/O error occurs,
- * which is possible because the construction of
- * the canonical pathname may require filesystem queries
- */
- public static URL[] getImportCodebaseURLs(String importCodebase)
- throws IOException, MalformedURLException
- {
- try {
- return getCodebaseURLs(importCodebase);
- } catch (MalformedURLException me) {
- return getClasspathURLs(importCodebase);
- }
- }
-
- /**
- * Utility method that retrieves the components making up the class loader
- * delegation tree for the current context class loader and returns each
- * in an <code>ArrayList</code>.
- *
- * @return an <code>ArrayList</code> instance in which each element of the
- * list is one of the components making up the current delegation
- * tree.
- */
- private static ArrayList getContextClassLoaderTree() {
- Thread curThread = Thread.currentThread();
- ClassLoader curClassLoader = curThread.getContextClassLoader();
- return getClassLoaderTree(curClassLoader);
- }
-
- /**
- * Utility method that retrieves the components making up the class loader
- * delegation tree for the given <code>classloader</code> parameter and
- * returns them via an <code>ArrayList</code>.
- *
- * @param classloader <code>ClassLoader</code> instance whose delegation
- * tree is to be retrieved and returned
- *
- * @return an <code>ArrayList</code> instance in which each element of the
- * list is one of the components making up the delegation tree
- * of the given class loader.
- */
- private static ArrayList getClassLoaderTree(ClassLoader classloader) {
- ArrayList loaderList = new ArrayList();
- while(classloader != null) {
- loaderList.add(classloader);
- classloader = classloader.getParent();
- }
- loaderList.add(null); //Append boot classloader
- Collections.reverse(loaderList);
- return loaderList;
- }
-
- /**
- * Utility method that displays the class loader delegation tree for
- * the current context class loader. For each class loader in the tree,
- * this method displays the locations from which that class loader
- * will retrieve and load requested classes.
- * <p>
- * This method can be useful when debugging problems related to the
- * receipt of exceptions such as <code>ClassNotFoundException</code>.
- */
- public static void displayContextClassLoaderTree() {
- Thread curThread = Thread.currentThread();
- ClassLoader curClassLoader = curThread.getContextClassLoader();
- displayClassLoaderTree(curClassLoader);
- }
-
- /**
- * Utility method that displays the class loader delegation tree for
- * the given class loader. For each class loader in the tree, this
- * method displays the locations from which that class loader will
- * retrieve and load requested classes.
- * <p>
- * This method can be useful when debugging problems related to the
- * receipt of exceptions such as <code>ClassNotFoundException</code>.
- *
- * Note that although this class' logger level is used to determine
- * whether or not to display any information at all, the output is
- * actually displayed using System.out.println. This is done to
- * produce more readable output than the logger might produce.
- *
- * @param description descriptive <code>String</code> that, if
- * non-<code>null</code>, will be logged prior to
- * displaying the information about the
- * <code>classloader</code>.
- *
- * @param classloader <code>ClassLoader</code> instance whose delegation
- * tree is to be displayed.
- */
- public static void displayClassLoaderTree(ClassLoader classloader) {
- displayClassLoaderTree(null, classloader);
- }
-
- public static void displayClassLoaderTree(String description,
- ClassLoader classloader)
- {
- if( logger.isEnabledFor(Level.DEBUG) ) {
- if(description != null) {
- logger.log(Level.DEBUG, description);
- }
-
- ArrayList loaderList = getClassLoaderTree(classloader);
- System.out.println("ClassLoader Tree has "
- + loaderList.size() + " levels");
- System.out.println(" cl0 -- Boot ClassLoader ");
- ClassLoader curClassLoader = null;
- for(int i=1; i < loaderList.size(); i++) {
- System.out.println(" |");
- curClassLoader = (ClassLoader)loaderList.get(i);
- System.out.print(" cl"+i+" -- ClassLoader "
- +curClassLoader+": ");
- if(curClassLoader instanceof URLClassLoader) {
- URL[] urls = ((URLClassLoader)(curClassLoader)).getURLs();
- if(urls != null) {
- System.out.print(urls[0]);
- for(int j=1;j<urls.length;j++){
- System.out.print(", "+urls[j]);
- }
- } else {//urls == null
- System.out.print("null search path");
- }
- } else {
- if(curClassLoader instanceof SecureClassLoader) {
- System.out.print("is instance of SecureClassLoader");
- } else {
- System.out.print("is unknown ClassLoader type");
- }
- }
- System.out.println("");
- }
- System.out.println("");
- }
- }
-
- /**
- * Handles a <i>class loader mismatch</i> between the given
- * <code>Serializable</code> object and the given <code>Class</code>
- * type.
- *
- * If the class name of the given <code>obj</code> parameter
- * is the same as the name of <code>classType</code>, but
- * <code>obj</code> is not an instance of <code>classType</code>,
- * then the difference may be due to unequal class loaders for the
- * two parameters; which is referred to as a <i>class loader mismatch</i>.
- * When such a mismatch occurs, the <code>instanceof</code> operator
- * will return <code>false</code> and attempts to cast the given
- * <code>obj</code> to the given <code>classType</code> will result
- * in a <code>ClassCastException</code>.
- *
- * To address the situation just described, this method attempts to
- * "reload" the given <code>obj</code>, using the <code>ClassLoader</code>
- * of <code>classType</code>. This is accomplished by first
- * marshalling and then unmarshalling the given <code>obj</code>,
- * while the <i>current context class loader</i> is set to the
- * <code>ClassLoader</code> of <code>classType</code>.
- *
- * Upon success, the newly loaded object is returned; which can then
- * be successfully cast to the given <code>classType</code>. If the
- * reload operation fails, <code>null</code> is returned.
- */
- public static Serializable instanceOf(Serializable obj, Class classType) {
-
- if( classType.isInstance(obj) ) return obj;
-
- Class objClass = obj.getClass();
- ClassLoader classTypeCl = classType.getClassLoader();
- //marshall-and-unmarshal using the class type's classloader
- try {
- MarshalledInstance mInst = new MarshalledInstance(obj);
- Serializable newObj =
- (Serializable)(mInst.get(classTypeCl, false, null, null));
- if( classType.isInstance(newObj) ) return newObj;
-
- } catch(Throwable t) {
- return null;
- }
- return null;
- }
-
-}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/EntryUtil.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/EntryUtil.java 2010-09-30 11:47:53 UTC (rev 3690)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/EntryUtil.java 2010-09-30 13:43:30 UTC (rev 3691)
@@ -75,7 +75,7 @@
* type. If no element in the array is an instance of the given
* type, then <code>null</code> is returned.
*/
- public static <T> T getEntryByType(Entry[] attrs, Class<T> type)
+ public static <T extends Entry> T getEntryByType(Entry[] attrs, Class<T> type)
{
if( (attrs == null) || (type == null) ) return null;
for(int i=0; i<attrs.length; i++) {
@@ -85,144 +85,144 @@
return null;
}//end getEntryByType
- /**
- * Examines the given array of entries and returns an array of all
- * elements that are an instance of the given class type. If no element in
- * the array is an instance of the given type, then <code>null</code> is
- * returned.
- */
- public static <T> T[] getEntriesByType(Entry[] attrs, Class<T> type)
- {
- if( (attrs == null) || (type == null) ) return null;
- ArrayList<T> matches = null;
- for(int i=0; i<attrs.length; i++) {
- if( !( type.isInstance(attrs[i]) ) ) continue;
- if ( matches == null )
- matches = new ArrayList<T>();
- matches.add( (T)attrs[i] );
- }//end loop
+// /**
+// * Examines the given array of entries and returns an array of all
+// * elements that are an instance of the given class type. If no element in
+// * the array is an instance of the given type, then <code>null</code> is
+// * returned.
+// */
+// public static <T> T[] getEntriesByType(Entry[] attrs, Class<T> type)
+// {
+// if( (attrs == null) || (type == null) ) return null;
+// ArrayList<T> matches = null;
+// for(int i=0; i<attrs.length; i++) {
+// if( !( type.isInstance(attrs[i]) ) ) continue;
+// if ( matches == null )
+// matches = new ArrayList<T>();
+// matches.add( (T)attrs[i] );
+// }//end loop
+//
+// if ( matches == null ) return null;
+//
+// return matches.toArray
+// ( (T[])java.lang.reflect.Array.newInstance
+// ( type, matches.size() ) );
+// }
- if ( matches == null ) return null;
+// /**
+// * Examines the given array of entries and returns a list of all
+// * elements that are an instance of the given class type. If no element
+// * in the array is an instance of the given type, then an empty list is
+// * returned.
+// */
+// public static <T> List<T> getEntryListByType(final Entry[] attrs,
+// final Class<T> type)
+// {
+// if(attrs == null) {
+// throw new NullPointerException("null attrs array");
+// }
+// if(type == null) {
+// throw new NullPointerException("null type");
+// }
+// final List<T> matches = new ArrayList<T>();
+// for (final Entry attr : attrs) {
+// if(type.isInstance(attr)){
+// matches.add(type.cast(attr));
+// }
+// }
+// return matches;
+// }
- return matches.toArray
- ( (T[])java.lang.reflect.Array.newInstance
- ( type, matches.size() ) );
- }
+// /**
+// * Examines the given array of entries and returns a list of all
+// * elements that match the given <code>template</code>; where
+// * the matching semantics are defined by the template-matching
+// * semantics specified in the Lookup Service Specification. If no
+// * element in the given array matches the template, then an empty
+// * list is returned.
+// */
+// public static <T extends Entry> List<T> getEntryList(final Entry[] attrs,
+// final T template)
+// {
+// final List<T> matches = new ArrayList<T>();
+// for (final Entry attr : attrs) {
+// if(LookupAttributes.matches(template, attr)){
+// matches.add((T) attr);
+// }
+// }
+// return matches;
+// }
- /**
- * Examines the given array of ...
[truncated message content] |
