svn commit: r1465625 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java

2013-04-08 Thread ecn
Author: ecn
Date: Mon Apr  8 13:21:06 2013
New Revision: 1465625

URL: http://svn.apache.org/r1465625
Log:
ACCUMULO-1251 applying Adam Fuch's patch to allow clients to recieve large 
messages

Modified:

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java?rev=1465625r1=1465624r2=1465625view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
 Mon Apr  8 13:21:06 2013
@@ -80,7 +80,7 @@ public class ThriftUtil {
   }
   
   static private TProtocolFactory protocolFactory = new TraceProtocolFactory();
-  static private TTransportFactory transportFactory = new 
TFramedTransport.Factory();
+  static private TTransportFactory transportFactory = new 
TFramedTransport.Factory(Integer.MAX_VALUE);
   
   static public T extends TServiceClient T 
createClient(TServiceClientFactoryT factory, TTransport transport) {
 return factory.getClient(protocolFactory.getProtocol(transport), 
protocolFactory.getProtocol(transport));




svn commit: r1465626 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/util/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/acc

2013-04-08 Thread ecn
Author: ecn
Date: Mon Apr  8 13:21:57 2013
New Revision: 1465626

URL: http://svn.apache.org/r1465626
Log:
ACCUMULO-1251 applying Adam Fuch's patch to allow clients to receive large 
messages

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1465625

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1465625

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1465625

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java?rev=1465626r1=1465625r2=1465626view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java 
(original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java 
Mon Apr  8 13:21:57 2013
@@ -80,7 +80,7 @@ public class ThriftUtil {
   }
   
   static private TProtocolFactory protocolFactory = new TraceProtocolFactory();
-  static private TTransportFactory transportFactory = new 
TFramedTransport.Factory();
+  static private TTransportFactory transportFactory = new 
TFramedTransport.Factory(Integer.MAX_VALUE);
   
   static public T extends TServiceClient T 
createClient(TServiceClientFactoryT factory, TTransport transport) {
 return factory.getClient(protocolFactory.getProtocol(transport), 
protocolFactory.getProtocol(transport));

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1465625

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1465625

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1465625

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1465625

Propchange: accumulo/trunk/src/
--
  Merged /accumulo/branches/1.5/src:r1465625




svn commit: r1465627 - in /accumulo/branches/1.5/server/src: main/java/org/apache/accumulo/server/master/state/ main/java/org/apache/accumulo/server/tabletserver/ test/java/org/apache/accumulo/server/

2013-04-08 Thread ecn
Author: ecn
Date: Mon Apr  8 13:26:04 2013
New Revision: 1465627

URL: http://svn.apache.org/r1465627
Log:
ACCUMULO-1247 detect additional bad location states

Modified:

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/master/state/RootTabletStateStoreTest.java

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java?rev=1465627r1=1465626r2=1465627view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
 Mon Apr  8 13:26:04 2013
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.server.cli.ClientOpts;
+import 
org.apache.accumulo.server.master.state.TabletLocationState.BadLocationStateException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -187,7 +188,13 @@ public class MergeStats {
 KeyExtent prevExtent = null;
 
 for (EntryKey,Value entry : scanner) {
-  TabletLocationState tls = 
MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
+  TabletLocationState tls;
+  try {
+tls = MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
+  } catch (BadLocationStateException e) {
+log.error(e, e);
+return false;
+  }
   if (!tls.extent.getTableId().equals(tableId)) {
 break;
   }

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java?rev=1465627r1=1465626r2=1465627view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
 Mon Apr  8 13:26:04 2013
@@ -39,6 +39,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.user.WholeRowIterator;
 import org.apache.accumulo.core.security.CredentialHelper;
 import org.apache.accumulo.core.security.thrift.TCredentials;
+import 
org.apache.accumulo.server.master.state.TabletLocationState.BadLocationStateException;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
@@ -109,16 +110,13 @@ public class MetaDataTableScanner implem
 try {
   return fetch();
 } catch (RuntimeException ex) {
-  try {
-close();
-  } catch (Exception e) {
-log.error(e, e);
-  }
-  throw ex;
-}
+  // something is wrong with the records in the !METADATA table, just skip 
over it
+  log.error(ex, ex);
+  return null;
+} 
   }
   
-  public static TabletLocationState createTabletLocationState(Key k, Value v) 
throws IOException {
+  public static TabletLocationState createTabletLocationState(Key k, Value v) 
throws IOException, BadLocationStateException {
 final SortedMapKey,Value decodedRow = WholeRowIterator.decodeRow(k, v);
 KeyExtent extent = null;
 TServerInstance future = null;
@@ -134,13 +132,25 @@ public class MetaDataTableScanner implem
   Text cq = key.getColumnQualifier();
   
   if (cf.compareTo(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY) == 0) 
{
-future = new TServerInstance(entry.getValue(), cq);
+TServerInstance location = new TServerInstance(entry.getValue(), cq);
+if (future != null) {
+  throw new BadLocationStateException(found two assignments for the 
same extent  + key.getRow() + :  + future +  and  + location);
+}
+future = location;
   } else if 
(cf.compareTo(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY) == 0) {
-current = new TServerInstance(entry.getValue(), cq);
+

svn commit: r1465630 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java

2013-04-08 Thread ecn
Author: ecn
Date: Mon Apr  8 13:32:16 2013
New Revision: 1465630

URL: http://svn.apache.org/r1465630
Log:
ACCUMULO-1247 detect additional bad location states

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/state/RootTabletStateStoreTest.java
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1465627

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1465627

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1465627

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1465627

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1465627

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1465627

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1465627

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java?rev=1465630r1=1465629r2=1465630view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
 Mon Apr  8 13:32:16 2013
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.server.cli.ClientOpts;
+import 
org.apache.accumulo.server.master.state.TabletLocationState.BadLocationStateException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -187,7 +188,13 @@ public class MergeStats {
 KeyExtent prevExtent = null;
 
 for (EntryKey,Value entry : scanner) {
-  TabletLocationState tls = 
MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
+  TabletLocationState tls;
+  try {
+tls = MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
+  } catch (BadLocationStateException e) {
+log.error(e, e);
+return false;
+  }
   if (!tls.extent.getTableId().equals(tableId)) {
 break;
   }

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java?rev=1465630r1=1465629r2=1465630view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
 Mon Apr  8 13:32:16 2013
@@ -39,6 +39,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.user.WholeRowIterator;
 import org.apache.accumulo.core.security.CredentialHelper;
 

svn commit: r1465687 - /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java

2013-04-08 Thread ecn
Author: ecn
Date: Mon Apr  8 17:24:25 2013
New Revision: 1465687

URL: http://svn.apache.org/r1465687
Log:
ACCUMULO-1252 remove loaded files outside the threadpool

Modified:

accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java

Modified: 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1465687r1=1465686r2=1465687view=diff
==
--- 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
 Mon Apr  8 17:24:25 2013
@@ -513,7 +513,7 @@ class LoadFiles extends MasterRepo {
 }
 fs.delete(writable, false);
 
-final ListString filesToLoad = Collections.synchronizedList(new 
ArrayListString());
+final SetString filesToLoad = Collections.synchronizedSet(new 
HashSetString());
 for (FileStatus f : files)
   filesToLoad.add(f.getPath().toString());
 
@@ -529,6 +529,7 @@ class LoadFiles extends MasterRepo {
   }
   
   // Use the threadpool to assign files one-at-a-time to the server
+  final ListString loaded = Collections.synchronizedList(new 
ArrayListString());
   for (final String file : filesToLoad) {
 results.add(threadPool.submit(new CallableListString() {
   @Override
@@ -548,7 +549,7 @@ class LoadFiles extends MasterRepo {
   log.debug(Asking  + pair.getFirst() +  to bulk import  + 
file);
   ListString fail = client.bulkImportFiles(null, 
SecurityConstants.getSystemCredentials(), tid, tableId, attempt, errorDir, 
setTime);
   if (fail.isEmpty()) {
-filesToLoad.remove(file);
+loaded.add(file);
   } else {
 failures.addAll(fail);
   }
@@ -564,6 +565,7 @@ class LoadFiles extends MasterRepo {
   SetString failures = new HashSetString();
   for (FutureListString f : results)
 failures.addAll(f.get());
+  filesToLoad.removeAll(loaded);
   if (filesToLoad.size()  0) {
 log.debug(tid  + tid +  attempt  + (attempt + 1) +   + 
sampleList(filesToLoad, 10) +  failed);
 UtilWaitThread.sleep(100);




svn commit: r1465688 - in /accumulo/branches/1.5: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/ma

2013-04-08 Thread ecn
Author: ecn
Date: Mon Apr  8 17:25:56 2013
New Revision: 1465688

URL: http://svn.apache.org/r1465688
Log:
ACCUMULO-1252 remove loaded files outside the threadpool

Modified:
accumulo/branches/1.5/   (props changed)
accumulo/branches/1.5/assemble/   (props changed)
accumulo/branches/1.5/core/   (props changed)
accumulo/branches/1.5/examples/   (props changed)

accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java 
  (props changed)

accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/branches/1.5/server/   (props changed)

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
accumulo/branches/1.5/src/   (props changed)

Propchange: accumulo/branches/1.5/
--
  Merged /accumulo/branches/1.4/src:r1465687
  Merged /accumulo/branches/1.4:r1465687

Propchange: accumulo/branches/1.5/assemble/
--
  Merged /accumulo/branches/1.4/src/assemble:r1465687
  Merged /accumulo/branches/1.4/assemble:r1465687

Propchange: accumulo/branches/1.5/core/
--
  Merged /accumulo/branches/1.4/core:r1465687
  Merged /accumulo/branches/1.4/src/core:r1465687

Propchange: accumulo/branches/1.5/examples/
--
  Merged /accumulo/branches/1.4/src/examples:r1465687

Propchange: 
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1465687
  Merged 
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1465687

Propchange: 
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1465687
  Merged 
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1465687

Propchange: accumulo/branches/1.5/server/
--
  Merged /accumulo/branches/1.4/server:r1465687
  Merged /accumulo/branches/1.4/src/server:r1465687

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1465688r1=1465687r2=1465688view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
 Mon Apr  8 17:25:56 2013
@@ -505,7 +505,7 @@ class LoadFiles extends MasterRepo {
 }
 fs.delete(writable, false);
 
-final ListString filesToLoad = Collections.synchronizedList(new 
ArrayListString());
+final SetString filesToLoad = Collections.synchronizedSet(new 
HashSetString());
 for (FileStatus f : files)
   filesToLoad.add(f.getPath().toString());
 
@@ -521,6 +521,7 @@ class LoadFiles extends MasterRepo {
   }
   
   // Use the threadpool to assign files one-at-a-time to the server
+  final ListString loaded = Collections.synchronizedList(new 
ArrayListString());
   for (final String file : filesToLoad) {
 results.add(threadPool.submit(new CallableListString() {
   @Override
@@ -540,7 +541,7 @@ class LoadFiles extends MasterRepo {
   log.debug(Asking  + pair.getFirst() +  to bulk import  + 
file);
   ListString fail = client.bulkImportFiles(Tracer.traceInfo(), 
SecurityConstants.getSystemCredentials(), tid, tableId, attempt, errorDir, 
setTime);
   if (fail.isEmpty()) {
-filesToLoad.remove(file);
+loaded.add(file);
   } else {
 failures.addAll(fail);
   }
@@ -556,6 +557,7 @@ class LoadFiles extends MasterRepo {
   SetString failures = new HashSetString();
   for (FutureListString f : results)
 failures.addAll(f.get());
+  filesToLoad.removeAll(loaded);
   if (filesToLoad.size()  0) {
 log.debug(tid  + tid +  attempt  + (attempt + 1) +   + 
sampleList(filesToLoad, 10) +  failed);
 UtilWaitThread.sleep(100);

Propchange: accumulo/branches/1.5/src/

svn commit: r1465796 - in /accumulo/branches/1.5: assemble/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/resources/org/apache/accumulo/core/conf/ docs/

2013-04-08 Thread ctubbsii
Author: ctubbsii
Date: Mon Apr  8 21:24:52 2013
New Revision: 1465796

URL: http://svn.apache.org/r1465796
Log:
ACCUMULO-1253 Fix build of docs/config.html; strike-through deprecated 
properties

Removed:
accumulo/branches/1.5/assemble/docgen.sh
Modified:
accumulo/branches/1.5/assemble/build.sh
accumulo/branches/1.5/assemble/pom.xml

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java

accumulo/branches/1.5/core/src/main/resources/org/apache/accumulo/core/conf/config.html
accumulo/branches/1.5/docs/documentation.css

Modified: accumulo/branches/1.5/assemble/build.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/build.sh?rev=1465796r1=1465795r2=1465796view=diff
==
--- accumulo/branches/1.5/assemble/build.sh (original)
+++ accumulo/branches/1.5/assemble/build.sh Mon Apr  8 21:24:52 2013
@@ -46,7 +46,5 @@ if [ $COUNT -ne $EXPECTED ]
 then
fail expected $EXPECTED files missing licenses, but saw $COUNT
 fi
-#need to run mvn package twice to properly build docs/config.html
-run mvn package
 run mvn package javadoc:aggregate javadoc:jar source:jar -Pdist
 run mvn -P assemble

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1465796r1=1465795r2=1465796view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Mon Apr  8 21:24:52 2013
@@ -73,13 +73,15 @@
   execution
 idconfig-webpage/id
 goals
-  goalexec/goal
+  goaljava/goal
 /goals
-phasepackage/phase
+phaseprepare-package/phase
 configuration
-  executablebash/executable
+  
mainClassorg.apache.accumulo.core.conf.DefaultConfiguration/mainClass
+  classpathScopecompile/classpathScope
   arguments
-argumentdocgen.sh/argument
+argument--generate-doc/argument
+
argument${project.build.directory}/../../docs/config.html/argument
   /arguments
 /configuration
   /execution

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1465796r1=1465795r2=1465796view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
 Mon Apr  8 21:24:52 2013
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.core.conf;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -55,7 +56,7 @@ public class DefaultConfiguration extend
   
   private static void generateDocumentation(PrintStream doc) {
 // read static content from resources and output
-InputStream data = 
DefaultConfiguration.class.getClassLoader().getResourceAsStream(config.html);
+InputStream data = 
DefaultConfiguration.class.getResourceAsStream(config.html);
 if (data != null) {
   byte[] buffer = new byte[1024];
   int n;
@@ -66,11 +67,11 @@ public class DefaultConfiguration extend
 e.printStackTrace();
 return;
   } finally {
- try { 
- data.close();
- } catch (IOException ex) {
- log .error(ex, ex);
- }
+try {
+  data.close();
+} catch (IOException ex) {
+  log.error(ex, ex);
+}
   }
 }
 doc.println();
@@ -80,46 +81,54 @@ public class DefaultConfiguration extend
 for (Property prop : Property.values()) {
   if (prop.isExperimental())
 continue;
-
+  
   if (prop.getType().equals(PropertyType.PREFIX))
 prefixes.add(prop);
   else
 sortedProps.put(prop.getKey(), prop);
 }
 
-doc.println(  pJump to: );
+int indentDepth = 2;
+doc.println(indent(indentDepth++) + pJump to: );
 String delimiter = ;
 for (Property prefix : prefixes) {
   if (prefix.isExperimental())
 continue;
-
+  
   doc.print(delimiter + a href='# + prefix.name() + ' + 
prefix.getKey() + */a);
   delimiter = nbsp;|nbsp;;
 }
-doc.println(  /p);
+doc.println(indent(--indentDepth) + /p);
 
-doc.println(  table);
+