Thread: [Bigdata-commit] SF.net SVN: bigdata:[3273] branches/bugfix-btm

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

Revision: 3273
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3273&view=rev
Author:   btmurphy
Date:     2010-07-23 17:58:30 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
merge -r3235:HEAD(3267) ~/bigdata/trunk ~/bigdata/branches/bugfix-btm [trunk --> branch bugfix-btm]

Modified Paths:
--------------
    branches/bugfix-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java
    branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config
    branches/bugfix-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testReggie.config
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testStartJini.config
    branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/zookeeper/testzoo.config
    branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNamedGraphs.java
    branches/bugfix-btm/build.properties
    branches/bugfix-btm/build.xml
    branches/bugfix-btm/src/resources/config/bigdataCluster.config
    branches/bugfix-btm/src/resources/config/jini/reggie.config
    branches/bugfix-btm/src/resources/config/jini/startAll.config
    branches/bugfix-btm/src/resources/config/logging.properties
    branches/bugfix-btm/src/resources/config/standalone/bigdataStandalone.config

Property Changed:
----------------
    branches/bugfix-btm/
    branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/
    branches/bugfix-btm/dsi-utils/
    branches/bugfix-btm/src/resources/bin/config/


Property changes on: branches/bugfix-btm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:2595-2877,2883-3010,3012-3235
   + /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:2595-2877,2883-3010,3012-3269

Modified: branches/bugfix-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java
===================================================================

--- branches/bugfix-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java	2010-07-23 17:58:30 UTC (rev 3273)
@@ -505,6 +505,141 @@
     }
 
     /**
+     * Special-purpose convenience method that returns a
+     * <code>String</code> value representing the ip address of 
+     * the current node; where the value that is returned is 
+     * determined according to following criteria:
+     * <p>
+     * <ul>
+     *  <li> If a non-<code>null</code> value is input for the
+     *       <code>systemPropertyName</code> parameter, then
+     *       this is viewed as a declaration by the caller that
+     *       that the system property with that given value
+     *       should take precedence over all other means of
+     *       determining the desired ip address. As such, this
+     *       method determines if a system property having the
+     *       given has indeed been set and, if it has, returns
+     *       the ip address of the nic having that name; or 
+     *       <code>null</code> if there is no nic with the 
+     *       desired name installed on the node.
+     *  <li> If a non-<code>null</code> value is input for the
+     *       <code>systemPropertyName</code> parameter, but
+     *       no system property with that name has been set, 
+     *       and <code>true</code> has been passed in for
+     *       the <code>fallbackOk</code> parameter, then this
+     *       method will return the IPV4 based address of the
+     *       first reachable nic that is found on the node.
+     *       Upon failing to find such an address, if the
+     *       <code>loopbackOk</code> parameter is also 
+     *       <code>true</code>, then this method will return
+     *       the <i>loop back</i> address of the node; otherwise
+     *       <code>null</code> is returned.
+     *  <li> If <code>null</code> is input for the 
+     *       <code>systemPropertyName</code> parameter, but
+     *       a non-<code>null</code> value is input for the
+     *       <code>defaultNic</code> parameter, then this
+     *       method returns the ip address of the nic having
+     *       that name; or <code>null</code> if there is no
+     *       nic with the desired default name installed on the
+     *       node.
+     *  <li> If <code>null</code> is input for both the 
+     *       <code>systemPropertyName</code> parameter and the
+     *       <code>defaultNic</code> parameter, and if the
+     *       <code>fallbackOk</code> parameter is <code>true</code>,
+     *       then this method will return the IPV4 based address
+     *       of the first reachable nic that is found on the node.
+     *       Upon failing to find such an address, if the
+     *       <code>loopbackOk</code> parameter is also 
+     *       <code>true</code>, then this method will return
+     *       the <i>loop back</i> address of the node; otherwise
+     *       <code>null</code> is returned.
+     * </ul>
+     * <p>
+     * This method can be called from within a configuration
+     * as well as from within program control.
+     *
+     * @param systemPropertyName <code>String</code> value containing
+     *                           the name of a system property whose
+     *                           value is the network interface name
+     *                           whose ip address should be returned.
+     *                           May be <code>null</code>.
+     *
+     * @param defaultNic         <code>String</code> value containing
+     *                           the name of the network interface
+     *                           whose ip address should be returned
+     *                           if <code>null</code> is input for the
+     *                           <code>systemPropertyName</code> parameter.
+     *
+     * @param fallbackOk         if <code>true</code>, then if either
+     *                           no system property is set having the
+     *                           name referenced by the 
+     *                           <code>systemPropertyName</code> parameter,
+     *                           or if <code>null</code> is input for both
+     *                           the <code>systemPropertyName</code>
+     *                           parameter and the <code>defaultNic</code>
+     *                           parameter, return the IPV4 based address
+     *                           of the first reachable network interface
+     *                           that can be found on the node.
+     *
+     * @param loopbackOk         if <code>true</code>, and if <code>true</code>
+     *                           is also input for the <code>fallbackOk</code>
+     *                           parameter, then if this method attempts,
+     *                           but fails, to find a valid IPV4 fallback
+     *                           address, then the node's <i>loop back</i>
+     *                           address is returned.
+     *
+     * @return a <code>String</code> representing an ip address associated
+     *         with the current node; where the value that is returned is
+     *         determined according to the criteria described above.
+     */
+    public static String getIpAddress(String  systemPropertyName,
+                                      String  defaultNic,
+                                      boolean fallbackOk,
+                                      boolean loopbackOk)
+                             throws SocketException, IOException
+    {
+        if(systemPropertyName != null) {//system property takes precedence
+            String nicName = System.getProperty(systemPropertyName);
+            boolean propSet = true;
+            if(nicName == null) {
+                propSet = false;
+            } else {
+                // handle ant script case where the system property
+                // may not have been set on the command line, but
+                // was still set to "${<systemPropertyName>}" using
+                // ant <sysproperty> tag
+                String rawProp = "${" + systemPropertyName + "}";
+                if( rawProp.equals(nicName) ) propSet = false;
+            }
+            if(propSet) {
+                return getIpAddress(nicName, 0, loopbackOk);
+            } else {//desired system property not set, try fallback
+                if(fallbackOk) {
+                    return getDefaultIpv4Address(loopbackOk);
+                } else {
+                    return null;
+                }
+            }
+        } else {//no system property name provided, try default nic
+            if(defaultNic != null) {
+                return getIpAddress(defaultNic, 0, loopbackOk);
+            } else {//no default nic provided, try fallback
+                if(fallbackOk) {
+                    return getDefaultIpv4Address(loopbackOk);
+                } else {
+                    return null;
+                }
+            }
+        }
+    }
+
+    public static String getIpAddress()
+                             throws SocketException, IOException
+    {
+        return getIpAddress(null, null, true, true);
+    }
+
+    /**
      * Examines each address associated with each network interface
      * card (nic) installed on the current node, and returns the
      * <code>String</code> value of the first such address that is
@@ -617,73 +752,6 @@
     }
 
     /**
-     * Special-purpose convenience method that will return the
-     * value of the system property named <code>default.nic</code>
-     * if that property has been set on the current VM to any
-     * non-<code>null</code> value other than the value,
-     * <code>${default.nic}</code>; otherwise returns the value
-     * input for the <code>defaultVal</code> parameter.
-     * <p>
-     * This method can be called from within a configuration
-     * as well as from within program control. It is provided
-     * as a way to allow mechanisms that are not able to
-     * conditionally set system properties to always set the
-     * system property named <code>default.nic</code> to some
-     * value -- either valid or invalid -- depending on whether
-     * that property is set as a system property on the command
-     * line. 
-     * <p>
-     * For example, the <code>java</code> ant task used to exec
-     * java based programs does not allow one to set a system
-     * property on that program's VM when that property is set
-     * on the command line used to execute ant, but leave that
-     * property un-set when ant's command line does not specify
-     * a value for that property. That is, although ant allows
-     * one to retrieve the value of a system property that is
-     * specified on ant's command line and substitute that value 
-     * (using Java's '${}' token-substitution mechanism) into 
-     * a system property set on the program's VM, ant does not
-     * allow one to leave that property un-set when the system
-     * property is not specified on ant's command line; the
-     * property must either always be set on the VM, or never
-     * set. If the ant script then is written to always set the
-     * system property on the exec'd program's VM to the
-     * value of the system property expected on ant's command
-     * line, then whenever that system property is not set on
-     * ant's command line, the value that is substituted into
-     * the system property when the program is exec-ed will be
-     * of the form, <code>${default.nic}</code>. If the program
-     * that is exec'd then attempts to call
-     * <code>System.getProperty("default.nic")</code>, that
-     * call will return the non-<code>null</code> value,
-     * <code>${default.nic}</code>; which is typically not
-     * what is desired.
-     *
-     * @param defaultVal <code>String</code> value that this method
-     *                   returns if the system property named
-     *                   <code>default.nic</code> is either not
-     *                   set or is equal to the value
-     *                   <code>${default.nic}</code>.
-     *
-     * @return a <code>String</code> value equal to the value of
-     *         the system property named <code>${default.nic}</code>
-     *         if that system property is set to any value except
-     *         <code>null</code> or the value <code>${default.nic}</code>;
-     *         otherwise, returns the value input for the 
-     *         <code>defaultVal</code> parameter.
-     */
-    public static String getDefaultNic(String defaultVal) {
-        String defaultNic = System.getProperty("default.nic");
-        if( ("${default.nic}").equals(defaultNic) ) defaultNic = null;
-        if(defaultNic == null) defaultNic = defaultVal;
-        return defaultNic;
-    }
-
-    public static String getDefaultNic() {
-        return getDefaultNic(null);
-    }
-
-    /**
      * Intended for use by scripts.
      */
     public static void main(String[] args) {

Modified: branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java
===================================================================
--- branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java	2010-07-23 17:58:30 UTC (rev 3273)
@@ -74,10 +74,8 @@
     private static String defaultGroup = null;
     static {
 	try {
-            thisHost = 
-                NicUtil.getIpAddress
-                    ( NicUtil.getDefaultNic
-                          ( NicUtil.getDefaultIpv4Address(true) ) );
+            thisHost = NicUtil.getIpAddress
+                           ("default.nic", null, true, true);
             defaultGroup = 
                 System.getProperty("bigdata.fedname",
                                    "bigdata.test.group-"+thisHost);

Modified: branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config
===================================================================
--- branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -10,8 +10,7 @@
 com.sun.jini.reggie {
     private static exportPort = 0;//randomly chosen port
     private static exportIpAddr = 
-        NicUtil.getDefaultNic
-                    ( NicUtil.getDefaultIpv4Address(true) );
+        NicUtil.getIpAddress("default.nic", null, true, true);
     private static codebasePort = 23333;//value used if not set by system prop
 
     // Public configuration entries

Modified: branches/bugfix-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
===================================================================
--- branches/bugfix-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -77,8 +77,7 @@
     static serviceDir = ConfigMath.getAbsoluteFile(new File(fedname));
 
     private static localIpAddr = 
-        NicUtil.getDefaultNic
-                    ( NicUtil.getDefaultIpv4Address(true) );
+        NicUtil.getIpAddress("default.nic", null, true, true);
 
     /*
      * Example cluster configuration.

Modified: branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testReggie.config
===================================================================
--- branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testReggie.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testReggie.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -15,8 +15,7 @@
 com.sun.jini.reggie {
 
     private static exportIpAddr = 
-        NicUtil.getDefaultNic
-                    ( NicUtil.getDefaultIpv4Address(true) );
+        NicUtil.getIpAddress("default.nic", null, true, true);
     private static exportPort = Integer.parseInt("0");
 
     private static serverILFactory =

Modified: branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testStartJini.config
===================================================================
--- branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testStartJini.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/jini/start/testStartJini.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -15,8 +15,7 @@
 
     private static appHome = System.getProperty("app.home", ConfigMath.getAbsolutePath(new File(".")) );
     private static codebaseHost = 
-        NicUtil.getDefaultNic
-                    ( NicUtil.getDefaultIpv4Address(true) );
+        NicUtil.getIpAddress("default.nic", null, true, true);
     private static codebasePort = "23334";
     private static defaultCodebaseRootDir =
         ConfigUtil.concat( new String[] { appHome, "${/}bigdata-jini${/}lib${/}jini${/}lib-dl" } );

Modified: branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/zookeeper/testzoo.config
===================================================================
--- branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/zookeeper/testzoo.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata-jini/src/test/com/bigdata/zookeeper/testzoo.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -34,8 +34,7 @@
     private static appHome = 
         System.getProperty("app.home", ConfigMath.getAbsolutePath(new File(".")) );
     private static localIpAddr = 
-        NicUtil.getDefaultNic
-                    ( NicUtil.getDefaultIpv4Address(true) );
+        NicUtil.getIpAddress("default.nic", null, true, true);
 
     /* A comma delimited list of the known zookeeper servers together
      * with their assigned "myid".


Property changes on: branches/bugfix-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fko/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql:3150-3194
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql:2775-2877,2883-3010,3012-3235
   + /branches/fko/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql:3150-3194
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql:2775-2877,2883-3010,3012-3269

Modified: branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNamedGraphs.java
===================================================================
--- branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNamedGraphs.java	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/bigdata-sails/src/test/com/bigdata/rdf/sail/TestNamedGraphs.java	2010-07-23 17:58:30 UTC (rev 3273)
@@ -33,7 +33,9 @@
 
 import org.apache.log4j.Logger;
 import org.openrdf.model.BNode;
+import org.openrdf.model.Resource;
 import org.openrdf.model.URI;
+import org.openrdf.model.ValueFactory;
 import org.openrdf.model.impl.BNodeImpl;
 import org.openrdf.model.impl.LiteralImpl;
 import org.openrdf.model.impl.URIImpl;
@@ -50,6 +52,7 @@
 import org.openrdf.query.impl.BindingImpl;
 import org.openrdf.repository.RepositoryException;
 import org.openrdf.sail.SailException;
+import com.bigdata.rdf.store.BD;
 
 /**
  * Unit tests for named graphs. Specify
@@ -1559,4 +1562,114 @@
 
     }
 
+    public void testSearchQuery() throws Exception {
+        
+        final BigdataSail sail = getSail();
+        sail.initialize();
+        final BigdataSailRepository repo = new BigdataSailRepository(sail);
+        final BigdataSailRepositoryConnection cxn = (BigdataSailRepositoryConnection) repo
+                .getConnection();
+        cxn.setAutoCommit(false);
+
+        try {
+
+            if (!sail.getDatabase().isQuads()) {
+
+                log.warn("test requires quads.");
+
+                return;
+
+            }
+
+            final ValueFactory vf = cxn.getValueFactory();
+    
+            //create context
+            final Resource context1 = vf.createURI( "http://example.org" );
+    
+            //add statement to context1
+            cxn.add( vf.createStatement( 
+                    vf.createURI("http://example.org#Chris"), 
+                    RDFS.LABEL, 
+                    vf.createLiteral("Chris") ),  
+                    context1);
+            cxn.commit();
+    
+            //add statement to default graph
+            cxn.add( vf.createStatement( 
+                    vf.createURI("http://example.org#Christian"), 
+                    RDFS.LABEL, 
+                    vf.createLiteral("Christian") ) );
+            cxn.commit();   
+    
+            {
+                //when running this query, we correctly get bindings for both triples
+                final String query = 
+                    "select ?x ?y " +
+                    "where {  " +
+                    "    ?y <"+ BD.SEARCH+"> \"Chris\" . " +
+                    "    ?x <"+ RDFS.LABEL.stringValue() + "> ?y . " +
+                    "}";
+
+                final TupleQuery tupleQuery = cxn.prepareTupleQuery(
+                        QueryLanguage.SPARQL, query);
+                final TupleQueryResult result = tupleQuery.evaluate();
+                
+//                int i = 1;
+//                while (result.hasNext()) {
+//                    System.err.println(i++ + "#: " + result.next());
+//                }
+                
+                final Collection<BindingSet> answer = new LinkedList<BindingSet>();
+                answer.add(createBindingSet(//
+                        new BindingImpl("x", vf.createURI("http://example.org#Christian")),//
+                        new BindingImpl("y", vf.createLiteral("Christian"))//
+                        ));
+                answer.add(createBindingSet(//
+                        new BindingImpl("x", vf.createURI("http://example.org#Chris")),//
+                        new BindingImpl("y", vf.createLiteral("Chris"))//
+                        ));
+
+                compare(result, answer);
+                
+            }
+            
+            {
+                //however, when running this query, we incorrectly get both results as it should only return bindings for the triple added to context 1.  
+                String query = 
+                    "select ?x ?y " +
+                    "where { " +
+                    "    graph <http://example.org> { " +
+                    "        ?y <"+ BD.SEARCH+"> \"Chris\" . " +
+                    "        ?x <"+ RDFS.LABEL.stringValue() + "> ?y ." +
+                    "    } . " +
+                    "}";
+                
+                final TupleQuery tupleQuery = cxn.prepareTupleQuery(
+                        QueryLanguage.SPARQL, query);
+                final TupleQueryResult result = tupleQuery.evaluate();
+                
+//                int i = 1;
+//                while (result.hasNext()) {
+//                    System.err.println(i++ + "#: " + result.next());
+//                }
+                
+                final Collection<BindingSet> answer = new LinkedList<BindingSet>();
+                answer.add(createBindingSet(//
+                        new BindingImpl("x", vf.createURI("http://example.org#Chris")),//
+                        new BindingImpl("y", vf.createLiteral("Chris"))//
+                        ));
+
+                compare(result, answer);
+                
+            }
+            
+        } finally {
+
+            cxn.close();
+            sail.__tearDownUnitTest();
+
+        }
+        
+    }
+
 }

Modified: branches/bugfix-btm/build.properties
===================================================================
--- branches/bugfix-btm/build.properties	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/build.properties	2010-07-23 17:58:30 UTC (rev 3273)
@@ -131,6 +131,9 @@
 # Where to write the log files.
 install.log.dir=${NAS}/log
 
+# Where to write the deployment distribution.
+install.dist.dir=${NAS}/dist
+
 # The 'install-as' user (defaults to the user running the installer).
 #
 # @TODO ant lacks sufficient mechanisms to set the user (chown).

Modified: branches/bugfix-btm/build.xml
===================================================================
--- branches/bugfix-btm/build.xml	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/build.xml	2010-07-23 17:58:30 UTC (rev 3273)
@@ -493,6 +493,7 @@
 <mkdir dir="${install.lib.dir}" />
 <mkdir dir="${install.bin.dir}" />
 <mkdir dir="${install.log.dir}" />
+<mkdir dir="${install.dist.dir}" />
 <!-- install configuration files. -->
 <copy toDir="${install.config.dir}">
 	<fileset dir="${bigdata.dir}/src/resources/config">
@@ -849,57 +850,39 @@
 
 	<!--                                                                   -->
 	<!--                    STANDALONE FEDERATION TARGETS                  -->
-	<!--                                                                   -->
+	<!--                         (test/benchamarking)                      -->
 
-<target name="standalone-setup" description="Setup properties used by the standalone federation and LUS start/stop.">
+<target name="generateLookupStarterJar" unless="lookupStarterJarAvailable">
+    <antcall target="testCompile" />
+</target>
+
+<target name="testLookupStarterJarAvailability">
+    <property name="bigdata-test.lib" location="${bigdata.dir}/bigdata-test/lib" />
+    <condition property="lookupStarterJarAvailable">
+        <available file="${bigdata-test.lib}/lookupstarter.jar"/>
+    </condition>
+</target>
+
+<target name="standalone-setup" depends="testLookupStarterJarAvailability,generateLookupStarterJar" description="Setup properties used by standalone federation and LUS start/stop.">
     <property name="app.home" location="${bigdata.dir}" />
     <property name="test.codebase.port" value="23333"/>
-    <property name="test.codebase.dir" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" />
+    <property name="test.codebase.dir" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl"/>
+    <property name="dist.lib" location="${bigdata.dir}/bigdata-jini/lib/jini/lib" />
+    <property name="dist.lib.dl" location="${bigdata.dir}/bigdata-jini/lib/jini/lib-dl" />
     <property name="test.codebase" value="http://${this.hostname}:${test.codebase.port}/jsk-dl.jar"/>
     <property name="java.security.policy" value="${bigdata.dir}/policy.all"/>
-	<property name="log4j.configuration" value="${bigdata.dir}/src/resources/config/standalone/log4j.properties"/>
+    <property name="log4j.configuration" value="resources/logging/log4j.properties"/>
     <property name="java.net.preferIPv4Stack" value="true"/>
     <property name="bigdata.fedname" value="${standalone.fed}"/>
 </target>
 
-<target name="standalone-startLookup" depends="jar,standalone-setup" description="Start the lookup service for the standalone federation.">
-  <java classname="com.bigdata.service.jini.util.LookupStarter"
-		fork="true" spawn="true">
-		<classpath refid="runtime.classpath" />
-    <sysproperty key="app.home" value="${app.home}"/>
-    <sysproperty key="jini.lib" value="${dist.lib}"/>
-    <sysproperty key="jini.lib.dl" value="${dist.lib.dl}"/>
-    <sysproperty key="java.security.policy" value="${java.security.policy}"/>
-    <sysproperty key="java.security.debug" value="off"/>
-    <sysproperty key="java.protocol.handler.pkgs" value="net.jini.url"/>
-    <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
-    <sysproperty key="codebase.port" value="${test.codebase.port}"/>
-    <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}"/>
-    <sysproperty key="bigdata.fedname" value="${bigdata.fedname}"/>
-  </java>
-</target>
-
-<target name="standalone-stopLookup" depends="jar,standalone-setup" description="Stop the lookup service for the standalone federation.">
-  <java classname="com.bigdata.service.jini.util.LookupStarter"
-	failonerror="true" fork="true" logerror="true">
-	<classpath refid="runtime.classpath" />
-    <sysproperty key="app.home" value="${app.home}"/>
-    <sysproperty key="jini.lib" value="${dist.lib}"/>
-    <sysproperty key="jini.lib.dl" value="${dist.lib.dl}"/>
-    <sysproperty key="java.security.policy" value="${java.security.policy}"/>
-    <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
-    <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}"/>
-    <sysproperty key="bigdata.fedname" value="${bigdata.fedname}"/>
-    <arg value="-stop" />
-  </java>
-</target>
-
 <!-- Note: You should 'nohup' this, e.g., "nohup ant standalone-start" to 
      avoid taking down the ServicesManagerServer if you are disconnected
      from a terminal. -->
 <target name="standalone-start" depends="jar,standalone-setup" description="Start the standalone federation.">
     <!-- Start the lookup service. -->
-	<antcall target="standalone-startLookup" />
+	<antcall target="startHttpd" />
+	<antcall target="startLookup" />
 	<java classname="com.bigdata.jini.start.ServicesManagerServer"
 		failonerror="true" fork="true" logerror="true">
 		<classpath refid="runtime.classpath" />
@@ -930,28 +913,26 @@
 		<arg value="src/resources/config/standalone/bigdataStandalone.config" />
 	</java>
 	<!-- Then take down the lookup service as well. -->
-    <antcall target="standalone-stopLookup" />
+    <antcall target="stopLookup" />
+    <antcall target="stopHttpd" />
 </target>
 
-<!-- @todo Add target to stand up a SPARQL endpoint for a KB namespace. Could be
-     Sesame Server or bigdata REST API. -->
-	
-<!-- Note: The source files must be "reasonable" for the bulk loader.  Each file
-     will be fully parsed into memory before writing onto the database.  Very
-     large source files must be split into smaller files.  See the 'split'
-     command under unix, but be aware that it will not generate more than 576
-     output files (24 x 24 = 576) and only 100 if you are using number suffixes.
-     For example, split an NT file into files of 200000 lines each: 
-     
-     mkdir splits; cd splits
-     split -l 200000 ../dataset.nt dataset
-     
-     You will also have to fix up the file extensions.  You can do this using
-     bash as follows:
-     
-     for file in *; do mv $file $file.nt; done
-     
-     -->
+<target name="standalone-start-nano-server" depends="jar" description="Start a small http server fronting for a bigdata database instance.">
+	<java classname="com.bigdata.rdf.sail.bench.NanoSparqlServer" fork="true" failonerror="true">
+		<arg line="${standalone.nanoServerPort} ${standalone.namespace} src/resources/config/standalone/bigdataStandalone.config" />
+		<jvmarg line="-server"/>
+		<jvmarg line="-Xmx200M"/>
+		<classpath refid="runtime.classpath" />
+	</java>
+</target>
+
+<target name="standalone-stop-nano-server" depends="jar" description="Stop the small http server running at the configured port.">
+	<java classname="com.bigdata.rdf.sail.bench.NanoSparqlServer" fork="true" failonerror="true">
+		<arg line="${standalone.nanoServerPort} -stop" />
+		<classpath refid="runtime.classpath" />
+	</java>
+</target>
+
 <target name="standalone-bulk-load" depends="jar" description="Bulk load RDF data into the standalone federation.">
 	<java classname="com.bigdata.rdf.load.MappedRDFDataLoadMaster"
 		failonerror="true" fork="true" logerror="true">
@@ -967,30 +948,14 @@
 		<!--                    -->
 		<!-- Per job parameters -->
 		<!--                    -->
-		<!-- The KB namespace ("kb" is a common default). -->
-		<jvmarg value="-Dbigdata.rdf.namespace=U10"/>
+		<!-- The namespace of the target KB. -->
+		<jvmarg value="-Dbigdata.rdf.namespace=${standalone.namespace}"/>
 		<!-- The job name (same as the KB namespace is a common default). -->
-		<jvmarg value="-Dbigdata.rdf.job.name=bulk-load-kb"/>
-		<!-- The file or directory containing RDF data to be loaded. 
-		
-		     Possible interesting data:
-		
-		     d:/bigdata-perf-analysis/lubm/U10
-		     d:/bigdata-perf-analysis/bsbm/bsbm_2785/dataset.nt
-		-->
-		<jvmarg value="-Dbigdata.rdf.data=d:/bigdata-perf-analysis/lubm/U10"/>
-		<!-- The file or directory containing zero or more RDF ontology files to be loaded.
-		
-			 Note: If you do not want to load any "ontology" data you can point this at an
-			 empty directory.  "ontology" data is loaded once - when a new KB instance is
-			 created.
-
-			 Possible interesting ontologies:
-		
-			bigdata-rdf/src/resources/data/lehigh/univ-bench.owl
-			d:/bigdata-perf-analysis/emptyDir
-		 -->
-		<jvmarg value="-Dbigdata.rdf.ontology=bigdata-rdf/src/resources/data/lehigh/univ-bench.owl"/>
+		<jvmarg value="-Dbigdata.rdf.job.name=bulk-load-kb-${standalone-namespace}"/>
+		<!-- The file or directory containing zero or more files to be loaded first. -->
+		<jvmarg value="-Dbigdata.rdf.ontology=${standalone.bulkLoad.ontology}"/>
+		<!-- The file or directory containing RDF data to be loaded. --> 
+		<jvmarg value="-Dbigdata.rdf.data=${standalone.bulkLoad.data}"/>
 		<!-- The main configuration file. -->
 		<arg value="src/resources/config/standalone/bigdataStandalone.config" />
 	</java>
@@ -1082,10 +1047,9 @@
     </java>
 </target>
 
-	<!--                                                                   -->
-	<!--                    UNIT TESTS ONLY BELOW HERE                     -->
-	<!--                                                                   -->
-	
+    <!--                                                    -->
+    <!--                      STAGING                       -->
+    <!--                                                    -->
     <target name="stage"
             description="stages resources (jar, config, policy, logging files) needed to package or execute the bigdata distribution."
             depends="jar">
@@ -1103,7 +1067,6 @@
       <property name="dist.var.config" location="${dist.var}/config" />
       <property name="dist.var.config.policy" location="${dist.var.config}/policy" />
       <property name="dist.var.config.logging" location="${dist.var.config}/logging" />
-      <property name="dist.var.config.zookeeper" location="${dist.var.config}/zookeeper" />
       <property name="dist.var.config.jini" location="${dist.var.config}/jini" />
 
       <delete dir="${dist.dir}" quiet="true"/>
@@ -1116,7 +1079,6 @@
       <mkdir dir="${dist.var.config}"/>
       <mkdir dir="${dist.var.config.policy}"/>
       <mkdir dir="${dist.var.config.logging}"/>
-      <mkdir dir="${dist.var.config.zookeeper}"/>
       <mkdir dir="${dist.var.config.jini}"/>
 
       <!-- Copy build.properties to the top-level config file -->
@@ -1186,10 +1148,6 @@
       <!-- Zookeeper library -->
       <copy file="${bigdata-zookeeper.lib}/zookeeper-3.2.1.jar"
             tofile="${dist.lib}/zookeeper.jar"/>
-<!--
-      <copy file="/home/brmurphy/zookeeper/cdd99c5/build/zookeeper-3.3.0.jar"
-            tofile="${dist.lib}/zookeeper.jar"/>
--->
 
       <!-- Jini library -->
 
@@ -1249,8 +1207,6 @@
             todir="${dist.bin.config}"/>
       <copy file="${src.resources}/bin/config/serviceStarter.config"
             todir="${dist.bin.config}"/>
-      <copy file="${src.resources}/bin/config/zookeeper.config"
-            todir="${dist.bin.config}"/>
 
       <!-- Stage security policy (config) files -->
       <copy file="${src.resources.config}/policy.all"
@@ -1303,6 +1259,329 @@
             todir="${dist.var.config.jini}"/>
     </target>
 
+    <!--                                                    -->
+    <!--                      RELEASE                       -->
+    <!--                                                    -->
+    <target name="deploy-artifact" depends="clean, stage"
+            description="Create compressed tar file for deployment.">
+        <tar destfile="${bigdata.dir}/REL.${version}.tgz" 
+                compression="gzip">
+
+          <tarfileset dir="${bigdata.dir}/dist">
+            <include name="bigdata/**" />
+
+            <exclude name="bigdata/bin/pstart" />
+
+          </tarfileset>
+
+          <!-- Add scripts separately, making them executable -->
+
+          <tarfileset dir="${bigdata.dir}/dist" filemode="755">
+            <include name="bigdata/bin/pstart" />
+
+          </tarfileset>
+        </tar>
+    </target>
+
+    <target name="ant-install-prepare" depends="jar, bundle" 
+            description="Stage all files (src, lib, config, etc.) needed for ant based install.">
+        <copy toDir="${build.dir}/bigdata/src">
+	    <fileset dir="${bigdata.dir}/bigdata/src" />
+        </copy>
+        <copy toDir="${build.dir}/bigdata-jini/src">
+	    <fileset dir="${bigdata.dir}/bigdata-jini/src" />
+        </copy>
+        <copy toDir="${build.dir}/bigdata-rdf/src">
+	    <fileset dir="${bigdata.dir}/bigdata-rdf/src" />
+        </copy>
+        <copy toDir="${build.dir}/bigdata-sails/src">
+	    <fileset dir="${bigdata.dir}/bigdata-sails/src" />
+        </copy>
+        <copy toDir="${build.dir}/lgpl-utils/src">
+	    <fileset dir="${bigdata.dir}/lgpl-utils/src" />
+        </copy>
+
+        <mkdir dir="${build.dir}/bigdata/lib" />
+        <copy toDir="${build.dir}/bigdata/lib">
+	    <fileset dir="${bigdata.dir}/bigdata/lib" />
+        </copy>
+
+        <mkdir dir="${build.dir}/bigdata-jini/lib" />
+        <copy toDir="${build.dir}/bigdata-jini/lib">
+    	    <fileset dir="${bigdata.dir}/bigdata-jini/lib" />
+        </copy>
+        <mkdir dir="${build.dir}/bigdata-rdf/lib" />
+        <copy toDir="${build.dir}/bigdata-rdf/lib">
+	    <fileset dir="${bigdata.dir}/bigdata-rdf/lib" />
+        </copy>
+
+        <mkdir dir="${build.dir}/bigdata-sails/lib" />
+        <copy toDir="${build.dir}/bigdata-sails/lib">
+            <fileset dir="${bigdata.dir}/bigdata-sails/lib" />
+        </copy>
+
+        <mkdir dir="${build.dir}/src" />
+        <mkdir dir="${build.dir}/src/resources" />
+        <mkdir dir="${build.dir}/src/resources/config" />
+        <copy toDir="${build.dir}/src/resources/config">
+            <fileset dir="${bigdata.dir}/src/resources/config" />
+        </copy>
+
+        <mkdir dir="${build.dir}/src/resources/scripts" />
+        <copy toDir="${build.dir}/src/resources/scripts">
+            <fileset dir="${bigdata.dir}/src/resources/scripts" />
+        </copy>
+
+        <copy tofile="${build.dir}/build.properties" file="build.properties" />
+        <copy tofile="${build.dir}/build.xml" file="build.xml" />
+        <copy tofile="${build.dir}/LICENSE.txt" file="LICENSE.txt" />
+        <copy tofile="${build.dir}/overview.html" file="overview.html" />
+        <copy tofile="${build.dir}/README-JINI" file="README-JINI" />
+        <copy toDir="${build.dir}/LEGAL" flatten="true">
+            <fileset dir="${bigdata.dir}">
+                <include name="**/LEGAL/*" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="ant-install-artifact" depends="clean, ant-install-prepare, stage"
+            description="Create complete source tar file for ant based install.">
+        <mkdir dir="${release.dir}" />
+        <tar destfile="${bigdata.dir}/DIST.${version}.tgz" compression="gzip">
+            <tarfileset dir="${build.dir}" prefix="${version}">
+                <include name="build.properties" />
+                <include name="build.xml" />
+                <include name="LICENSE.txt" />
+                <include name="overview.html" />
+                <include name="README-JINI" />
+                <include name="LEGAL/*" />
+
+                <include name="bigdata/src/**" />
+                <include name="bigdata-jini/src/**" />
+                <include name="bigdata-rdf/src/**" />
+                <include name="bigdata-sails/src/**" />
+                <include name="lgpl-utils/src/**" />
+                <include name="bigdata/lib/**" />
+                <include name="bigdata-jini/lib/**" />
+                <include name="bigdata-rdf/lib/**" />
+                <include name="bigdata-sails/lib/**" />
+                <include name="src/**" />
+                <exclude name="classes/**" />
+                <exclude name="${version}.jar" />
+                <exclude name="lib/**" />
+                <exclude name="docs/**" />
+
+                <exclude name="dist/bigdata/**" />
+
+            </tarfileset>
+
+            <!-- Add dist files separately, minus scripts -->
+
+            <tarfileset dir="${bigdata.dir}" prefix="${version}">
+                <include name="dist/bigdata/**" />
+
+                <exclude name="dist/bigdata/bin/pstart" />
+            </tarfileset>
+
+            <!-- Add dist scripts separately, making them executable -->
+
+            <tarfileset dir="${bigdata.dir}" prefix="${version}" filemode="755">
+                <include name="dist/bigdata/bin/pstart" />
+            </tarfileset>
+        </tar>
+
+        <tar destfile="${bigdata.dir}/REL.${version}.tgz" 
+                basedir="${bigdata.dir}/dist"
+                compression="gzip">
+        </tar>
+    </target>
+
+    <target name="ant-install" depends="jar, banner, bundle" description="Ant based install on a node.">
+        <mkdir dir="${NAS}" />
+        <mkdir dir="${LAS}" />
+        <chmod perm="ug+rw,o-rw">
+            <fileset dir="${NAS}" />
+        </chmod>
+        <chmod perm="ug+rw,o-rw">
+            <fileset dir="${LAS}" />
+        </chmod>
+        <mkdir dir="${install.config.dir}" />
+        <mkdir dir="${install.doc.dir}" />
+        <mkdir dir="${install.lib.dir}" />
+        <mkdir dir="${install.bin.dir}" />
+        <mkdir dir="${install.log.dir}" />
+        <mkdir dir="${install.dist.dir}" />
+        <copy toDir="${install.config.dir}">
+            <fileset dir="${bigdata.dir}/src/resources/config" />
+        </copy>
+        <copy toDir="${install.doc.dir}">
+            <fileset dir="${bigdata.dir}">
+                <include name="LICENSE.txt" />
+                <include name="overview.html" />
+                <include name="README-JINI" />
+                <include name="bigdata/LEGAL/*" />
+                <include name="bigdata-jini/LEGAL/*" />
+                <include name="bigdata-rdf/LEGAL/*" />
+                <include name="bigdata-sails/LEGAL/*" />
+            </fileset>
+        </copy>
+
+        <copy toDir="${install.lib.dir}">
+            <fileset dir="${build.dir}/lib" />
+            <fileset file="${build.dir}/${version}.jar" />
+        </copy>
+
+        <copy toDir="${install.bin.dir}">
+            <fileset dir="src/resources/scripts" />
+        </copy>
+
+        <copy toDir="${install.dist.dir}">
+            <fileset dir="${bigdata.dir}/dist">
+                <include name="bigdata/**" />
+            </fileset>
+        </copy>
+
+        <!-- parameter substitution. -->
+        <property name="myclasspath" refid="install.classpath" />
+        <replace dir="${install.bin.dir}" summary="true">
+            <replacefilter token="@FED@" value="${FED}" />
+            <replacefilter token="@NAS@" value="${NAS}" />
+            <replacefilter token="@LAS@" value="${LAS}" />
+            <replacefilter token="@JAVA_HOME@" value="${JAVA_HOME}" />
+            <replacefilter token="@JINI_CLASS_SERVER_PORT@" value="${JINI_CLASS_SERVER_PORT}" />
+            <replacefilter token="@LOAD_BALANCER_PORT@" value="${LOAD_BALANCER_PORT}" />
+            <replacefilter token="@SYSSTAT_HOME@" value="${SYSSTAT_HOME}" />
+            <replacefilter token="@USE_NIO@" value="${USE_NIO}" />
+            <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" />
+            <replacefilter token="@LIB_DIR@" value="${install.lib.dir}" />
+            <replacefilter token="@LOG_DIR@" value="${install.log.dir}" />
+            <replacefilter token="@CONFIG_DIR@" value="${install.config.dir}" />
+            <replacefilter token="@INSTALL_USER@" value="${install.user}" />
+            <replacefilter token="@INSTALL_GROUP@" value="${install.group}" />
+            <replacefilter token="@LOCK_FILE@" value="${LOCK_FILE}" />
+            <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" />
+            <replacefilter token="@JINI_CONFIG@" value="${jini.config}" />
+            <replacefilter token="@POLICY_FILE@" value="${policyFile}" />
+            <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" />
+            <replacefilter token="@LOG4J_SOCKET_LOGGER_PORT@" value="${LOG4J_SOCKET_LOGGER_PORT}" />
+            <replacefilter token="@LOG4J_SOCKET_LOGGER_CONFIG@" value="${log4jServer.config}" />
+            <replacefilter token="@LOG4J_DATE_PATTERN@" value="${LOG4J_DATE_PATTERN}" />
+            <replacefilter token="@LOG4J_CONFIG@" value="${log4j.config}" />
+            <replacefilter token="@LOGGING_CONFIG@" value="${logging.config}" />
+            <replacefilter token="@ERROR_LOG@" value="${errorLog}" />
+            <replacefilter token="@DETAIL_LOG@" value="${detailLog}" />
+            <replacefilter token="@EVENT_LOG@" value="${eventLog}" />
+            <replacefilter token="@RULE_LOG@" value="${ruleLog}" />
+            <replacefilter token="@STATE_LOG@" value="${stateLog}" />
+            <replacefilter token="@STATE_FILE@" value="${stateFile}" />
+            <replacefilter token="@FORCE_KILL_ALL@" value="${forceKillAll}" />
+            <replacefilter token="@NTP_MASTER@" value="${NTP_MASTER}" />
+            <replacefilter token="@NTP_NETWORK@" value="${NTP_NETWORK}" />
+            <replacefilter token="@NTP_NETMASK@" value="${NTP_NETMASK}" />
+            <replacefilter token="@CLASSPATH@" value="${myclasspath}" />
+            </replace>
+
+        <replace dir="${install.config.dir}" summary="true">
+            <replacefilter token="@FED@" value="${FED}" />
+            <replacefilter token="@NAS@" value="${NAS}" />
+            <replacefilter token="@LAS@" value="${LAS}" />
+            <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" />
+            <replacefilter token="@JAVA_HOME@" value="${JAVA_HOME}" />
+            <replacefilter token="@JINI_CLASS_SERVER_PORT@" value="${JINI_CLASS_SERVER_PORT}" />
+            <replacefilter token="@LOAD_BALANCER_PORT@" value="${LOAD_BALANCER_PORT}" />
+            <replacefilter token="@SYSSTAT_HOME@" value="${SYSSTAT_HOME}" />
+            <replacefilter token="@USE_NIO@" value="${USE_NIO}" />
+            <replacefilter token="@BIN_DIR@" value="${install.bin.dir}" />
+            <replacefilter token="@LIB_DIR@" value="${install.lib.dir}" />
+            <replacefilter token="@LOG_DIR@" value="${install.log.dir}" />
+            <replacefilter token="@CONFIG_DIR@" value="${install.config.dir}" />
+            <replacefilter token="@INSTALL_USER@" value="${install.user}" />
+            <replacefilter token="@INSTALL_GROUP@" value="${install.group}" />
+            <replacefilter token="@LOCK_FILE@" value="${LOCK_FILE}" />
+            <replacefilter token="@BIGDATA_CONFIG@" value="${bigdata.config}" />
+            <replacefilter token="@JINI_CONFIG@" value="${jini.config}" />
+            <replacefilter token="@POLICY_FILE@" value="${policyFile}" />
+            <replacefilter token="@LOG4J_SOCKET_LOGGER_HOST@" value="${LOG4J_SOCKET_LOGGER_HOST}" />
+            <replacefilter token="@LOG4J_SOCKET_LOGGER_PORT@" value="${LOG4J_SOCKET_LOGGER_PORT}" />
+            <replacefilter token="@LOG4J_SOCKET_LOGGER_CONFIG@" value="${log4jServer.config}" />
+            <replacefilter token="@LOG4J_DATE_PATTERN@" value="${LOG4J_DATE_PATTERN}" />
+            <replacefilter token="@LOG4J_CONFIG@" value="${log4j.config}" />
+            <replacefilter token="@LOGGING_CONFIG@" value="${logging.config}" />
+            <replacefilter token="@ERROR_LOG@" value="${errorLog}" />
+            <replacefilter token="@DETAIL_LOG@" value="${detailLog}" />
+            <replacefilter token="@EVENT_LOG@" value="${eventLog}" />
+            <replacefilter token="@RULE_LOG@" value="${ruleLog}" />
+            <replacefilter token="@STATE_LOG@" value="${stateLog}" />
+            <replacefilter token="@STATE_FILE@" value="${stateFile}" />
+            <replacefilter token="@FORCE_KILL_ALL@" value="${forceKillAll}" />
+            <replacefilter token="@NTP_MASTER@" value="${NTP_MASTER}" />
+            <replacefilter token="@NTP_NETWORK@" value="${NTP_NETWORK}" />
+            <replacefilter token="@NTP_NETMASK@" value="${NTP_NETMASK}" />
+            <replacefilter token="@CLASSPATH@" value="${myclasspath}" />
+            <!-- updates the configuration file to locate the lubm ontology. -->
+            <replacefilter token="@install.lubm.config.dir@" value="${install.lubm.config.dir}" />
+        </replace>
+
+        <!-- fix newlines (otherwise substitutions cause things to break). -->
+        <fixcrlf srcDir="${install.config.dir}" />
+        <fixcrlf srcDir="${install.bin.dir}" />
+
+        <!-- set execute bit for scripts in this directory (must be the last step). -->
+        <chmod perm="u+x,g+rx,o-rwx">
+            <fileset dir="${install.bin.dir}">
+                <exclude name="README"/>
+                <exclude name="POST-INSTALL"/>
+            </fileset>
+        </chmod>
+
+        <!-- Setup the status file which will be read by the bigdata script and
+             the log on which that script will write its output.  This is used
+             if cron, or a similar process, will execute the script on a periodic
+             basis.  The initial state is always 'status'.  The initial stateLog
+             is always empty.  The state file must be readable by the group, but
+             could be restricted to write by a specific user. The stateLog must be
+             read/write for the group. -->
+
+<echo file="${stateFile}">status</echo>
+<echo file="${stateLog}">
+</echo>
+
+        <chmod perm="g+rw,o-rw" file="${stateFile}" />
+        <chmod perm="g+rw,o-rw" file="${stateLog}" />
+
+        <!-- Make sure that the entire shared directory structure is read/write for the group. -->
+        <chmod perm="g+rwx" type="both" dir="${NAS}" verbose="true"/>
+
+<!-- Make sure that it is all accessible to the install group (ant 1.6+ plus extension module required). 
+        <chown file="${NAS}" type="both" owner="${install.user}.${install.group}" verbose="true"/>
+-->
+
+        <!-- Works for earlier versions of ant LT 1.6 which do not bundle "chown". -->
+        <apply executable="chown" description="set owner on NAS files" os="Linux">
+            <arg value="-R"/>
+            <arg value="${install.user}.${install.group}"/>
+            <dirset dir="${NAS}"/>
+        </apply>
+
+        <!-- @todo check the installed configuration file (after parameter substitution). -->
+        <!-- @todo also check the installed jini configuration files. -->
+        <java classname="com.bigdata.jini.util.CheckConfiguration"
+	    failonerror="true" fork="true" logerror="true">
+	    <classpath refid="install.classpath" />
+	    <arg value="${bigdata.config}" />
+        </java>
+
+        <loadfile property="postInstallMessage" srcFile="${install.bin.dir}/POST-INSTALL" />
+
+<echo>
+
+${postInstallMessage}</echo>
+
+    </target>
+
+    <!--                                                    -->
+    <!--                    UNIT TESTS                      -->
+    <!--                                                    -->
     <target name="testCompile"
             description="compiles the test source and generates the appropriate jar files."
             depends="stage">


Property changes on: branches/bugfix-btm/dsi-utils
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fko/dsi-utils:3150-3194
/trunk/dsi-utils:2775-2877,2883-3010,3012-3235
   + /branches/fko/dsi-utils:3150-3194
/trunk/dsi-utils:2775-2877,2883-3010,3012-3269


Property changes on: branches/bugfix-btm/src/resources/bin/config
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fko/src/resources/bin/config:3150-3194
/trunk/src/resources/bin/config:2775-2877,2883-3010,3012-3235
   + /branches/fko/src/resources/bin/config:3150-3194
/trunk/src/resources/bin/config:2775-2877,2883-3010,3012-3269

Modified: branches/bugfix-btm/src/resources/config/bigdataCluster.config
===================================================================
--- branches/bugfix-btm/src/resources/config/bigdataCluster.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/src/resources/config/bigdataCluster.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -378,6 +378,9 @@
         "-Xmx400m",
         "-Djava.security.policy="+bigdata.policy,
         "-Djava.util.logging.config.file="+bigdata.logging,
+        "-Dlog4j.configuration="+bigdata.log4j,
+        "-Dlog4j.primary.configuration="+bigdata.log4j,
+        "-DinitialMemberGroups="+bigdata.fedname
 
     };
 

Modified: branches/bugfix-btm/src/resources/config/jini/reggie.config
===================================================================
--- branches/bugfix-btm/src/resources/config/jini/reggie.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/src/resources/config/jini/reggie.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -1,3 +1,52 @@
+
+import java.net.NetworkInterface;
+
+import com.sun.jini.config.ConfigUtil;
+import net.jini.constraint.BasicMethodConstraints;
+import net.jini.core.constraint.ConnectionRelativeTime;
+import net.jini.core.constraint.InvocationConstraints;
+import net.jini.jeri.BasicILFactory;
+import net.jini.jeri.BasicJeriExporter;
+import net.jini.jeri.tcp.TcpServerEndpoint;
+import net.jini.core.discovery.LookupLocator;
+
+import com.bigdata.util.config.NicUtil;
+
 com.sun.jini.reggie {
-    initialMemberGroups = new String[] { System.getProperty("user.name") + "InstallVerifyGroup" };
+
+    private static exportIpAddr = NicUtil.getIpAddress(null, null, true, true);
+
+    private static exportPort = 
+        Integer.parseInt( System.getProperty("exportPort", "0") );
+
+    private static serverILFactory =
+        new BasicILFactory(
+            new BasicMethodConstraints(
+                new InvocationConstraints(
+                    new ConnectionRelativeTime(10000L),
+                    null)),
+            null);
+
+    serverExporter = new BasicJeriExporter(TcpServerEndpoint.getInstance(exportIpAddr,exportPort),
+                                           serverILFactory,
+                                           false,
+                                           true);
+
+    initialMemberGroups   = new String[] {  System.getProperty("initialMemberGroups", System.getProperty("user.name")+"InstallVerifyGroup" ) };
+    initialLookupGroups   = initialMemberGroups;
+    initialLookupLocators = new LookupLocator[] { };
+
+    unicastDiscoveryHost = exportIpAddr;
+    multicastInterfaces = new NetworkInterface[] {
+        NicUtil.getNetworkInterface(exportIpAddr)
+    };
+
+    minMaxServiceLease = 60000L;
 }
+
+net.jini.discovery.LookupDiscovery {
+    multicastRequestHost = com.sun.jini.reggie.exportIpAddr;
+    multicastInterfaces = new NetworkInterface[] {
+        NicUtil.getNetworkInterface(com.sun.jini.reggie.exportIpAddr)
+    };
+}

Modified: branches/bugfix-btm/src/resources/config/jini/startAll.config
===================================================================
--- branches/bugfix-btm/src/resources/config/jini/startAll.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/src/resources/config/jini/startAll.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -19,11 +19,6 @@
 
   browser: A visualization tool for exploring Jini(TM) Network Technology communities. 
    reggie: Provides implementations of ServiceRegistrar. 
-  fiddler: Provides the server side of an implementation of the lookup discovery service.
-   mahalo: Provides implementations of the TransactionManager service.
-  mercury: Provides implementations of the EventMailbox service.
-     norm: Provides implementations of LeaseRenewalService.
-outrigger: Provides implementation of a JavaSpaces(TM) technology-enabled service.
  
 */
 com.sun.jini.start {
@@ -63,41 +58,6 @@
             policyFile,
             libDir+"reggie.jar",
             "com.sun.jini.reggie.TransientRegistrarImpl",
-            new String[] { configDir+"reggie.config" }),
-
-        new NonActivatableServiceDescriptor(
-            "http://" + host + ":" + port + "/fiddler-dl.jar" + jskdl,
-            policyFile,
-            libDir+"fiddler.jar",
-            "com.sun.jini.fiddler.TransientFiddlerImpl",
-            new String[] { configDir+"fiddler.config" }),
-
-        new NonActivatableServiceDescriptor(
-            "http://" + host + ":" + port + "/mahalo-dl.jar" + jskdl,
-            policyFile,
-            libDir+"mahalo.jar",
-            "com.sun.jini.mahalo.TransientMahaloImpl",
-            new String[] { configDir+"mahalo.config" }),
-
-        new NonActivatableServiceDescriptor(
-            "http://" + host + ":" + port + "/mercury-dl.jar" + jskdl,
-            policyFile,
-            libDir+"mercury.jar",
-            "com.sun.jini.mercury.TransientMercuryImpl",
-            new String[] { configDir+"mercury.config" }),
-
-        new NonActivatableServiceDescriptor(
-            "http://" + host + ":" + port + "/norm-dl.jar" + jskdl,
-            policyFile,
-            libDir+"norm.jar",
-            "com.sun.jini.norm.TransientNormServerImpl",
-            new String[] { configDir+"norm.config" }),
-
-        new NonActivatableServiceDescriptor(
-            "http://" + host + ":" + port + "/outrigger-dl.jar" + jskdl,
-            policyFile,
-            libDir+"outrigger.jar",
-            "com.sun.jini.outrigger.TransientOutriggerImpl",
-            new String[] { configDir+"outrigger.config" })
+            new String[] { configDir+"reggie.config" })
     };
 }

Modified: branches/bugfix-btm/src/resources/config/logging.properties
===================================================================
--- branches/bugfix-btm/src/resources/config/logging.properties	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/src/resources/config/logging.properties	2010-07-23 17:58:30 UTC (rev 3273)
@@ -40,7 +40,7 @@
 java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
 
 # Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = INFO
+java.util.logging.ConsoleHandler.level = FINEST
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 
@@ -51,11 +51,18 @@
 
 # For example, set the com.xyz.foo logger to only log SEVERE
 # messages:
-com.xyz.foo.level = SEVERE
+# com.xyz.foo.level = SEVERE
 
 # This turns off the annoying stack trace when we probe to determine
 # whether or not jini is already running on a specific host (unicast
 # discovery).  Of course, it could also hide other things so you may
 # want to comment this out.
 
-net.jini.discovery.LookupLocatorDiscovery = WARN
+net.jini.discovery.LookupLocatorDiscovery.level = WARNING
+
+#com.sun.jini.start.level = FINEST
+#com.sun.jini.reggie.level = FINEST
+#net.jini.discovery.level = FINEST
+#net.jini.config.level = FINEST
+#net.jini.lookup.JoinManager.level = FINEST
+#net.jini.lookup.ServiceDiscoveryManager.level = FINEST

Modified: branches/bugfix-btm/src/resources/config/standalone/bigdataStandalone.config
===================================================================
--- branches/bugfix-btm/src/resources/config/standalone/bigdataStandalone.config	2010-07-23 17:36:38 UTC (rev 3272)
+++ branches/bugfix-btm/src/resources/config/standalone/bigdataStandalone.config	2010-07-23 17:58:30 UTC (rev 3273)
@@ -30,6 +30,7 @@
 
 // imports for various options.
 import com.bigdata.btree.IndexMetadata;
+import com.bigdata.btree.keys.KeyBuilder;
 import com.bigdata.rdf.sail.BigdataSail;
 import com.bigdata.rdf.spo.SPORelation;
 import co...
 
[truncated message content]

Thread: [Bigdata-commit] SF.net SVN: bigdata:[3273] branches/bugfix-btm

Fast, scalable, robust graph database platform

bigdata-commit