Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3539] branches/maven_scaleout/bigdata-core/src/main
|
From: <sgo...@us...> - 2010-09-13 20:28:14
|
Revision: 3539
http://bigdata.svn.sourceforge.net/bigdata/?rev=3539&view=rev
Author: sgossard
Date: 2010-09-13 20:28:07 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
[merge dev-btm --> maven_scaleout] : Merge of ^/branches/dev-btm , revision 3468:3470. Small patches related to merge of revision 3463.
Revision Links:
--------------
http://bigdata.svn.sourceforge.net/bigdata/?rev=3468&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=3463&view=rev
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/boot-processes.xml
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java
Property Changed:
----------------
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/
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/
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot
___________________________________________________________________
Added: 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
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/boot-processes.xml
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/boot-processes.xml 2010-09-13 19:57:08 UTC (rev 3538)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot/boot-processes.xml 2010-09-13 20:28:07 UTC (rev 3539)
@@ -77,7 +77,7 @@
<javaprop name="java.util.logging.config.file"
value="${bigdata.configDir}/logging/logging.properties"/>
- <property name="java.classpath" value="${bootLauncherClasspath}"/>
+ <property name="java.classpath" value="${bootLauncherClasspath}${:}lib/fastutil.jar${:}lib/dsiutils.jar${:}lib/cweb-extser.jar"/>
<property name="java.app.mainclass"
value="com.bigdata.boot.starter.SingleNonActivatableServiceStarter"/>
<arg value="${bigdata.configDir}/policy/service.policy"/>
@@ -95,7 +95,7 @@
<javaprop name="java.util.logging.config.file"
value="${bigdata.configDir}/logging/logging.properties"/>
- <property name="java.classpath" value="${bootLauncherClasspath}"/>
+ <property name="java.classpath" value="${bootLauncherClasspath}${:}lib/fastutil.jar${:}lib/dsiutils.jar${:}lib/ctc_utils.jar"/>
<property name="java.app.mainclass"
value="com.bigdata.boot.starter.SingleNonActivatableServiceStarter"/>
<arg value="${bigdata.configDir}/policy/service.policy"/>
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
/branches/dev-btm/bigdata-jini/src/java:3463
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460
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
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
+ /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
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
+ /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java 2010-09-13 19:57:08 UTC (rev 3538)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java 2010-09-13 20:28:07 UTC (rev 3539)
@@ -108,7 +108,7 @@
if ( (MetadataServer.class.getName()).equals(className) ) {
System.out.println("*** MetadataConfiguration.MetadataServiceStarter: getDataDir [MetadataServer.Options.DATA_DIR="+MetadataServer.Options.DATA_DIR+", serviceDir="+serviceDir.toString()+"] ***");
return new NV(MetadataServer.Options.DATA_DIR, serviceDir.toString());
- } else if ( (com.bigdata.loadbalancer.ServiceImpl.class.getName()).equals(className) ) {
+ } else if ( (com.bigdata.metadata.ServiceImpl.class.getName()).equals(className) ) {
System.out.println("*** MetadataConfiguration.MetadataServiceStarter: getDataDir [EmbeddedShardLocator.Options.DATA_DIR="+EmbeddedShardLocator.Options.DATA_DIR+", serviceDir="+serviceDir.toString()+"] ***");
return new NV(EmbeddedShardLocator.Options.DATA_DIR, serviceDir.toString());
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
