svn commit: r1477423 - in /accumulo/trunk: ./ assemble/ assemble/scripts/init.d/accumulo-tserver
Author: vines Date: Tue Apr 30 00:27:18 2013 New Revision: 1477423 URL: http://svn.apache.org/r1477423 Log: ACCUMULO-792 - slightly dated description Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/assemble/scripts/init.d/accumulo-tserver Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1477420-1477422 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1477420-1477422 Modified: accumulo/trunk/assemble/scripts/init.d/accumulo-tserver URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/scripts/init.d/accumulo-tserver?rev=1477423&r1=1477422&r2=1477423&view=diff == --- accumulo/trunk/assemble/scripts/init.d/accumulo-tserver (original) +++ accumulo/trunk/assemble/scripts/init.d/accumulo-tserver Tue Apr 30 00:27:18 2013 @@ -1,13 +1,13 @@ #! /bin/sh # chkconfig: 2345 21 15 ### BEGIN INIT INFO -# Provides: accumulo-slave +# Provides: accumulo-tserver # Required-Start: $network $local_fs hadoop-namenode hadoop-datanode zookeeper-server accumulo-master # Required-Stop:$network $local_fs hadoop-datanode hadoop-namenode zookeeper-server accumulo-master # Default-Start:2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: accumulo tserver and logger processes -# Description: The accumulo slaves bundle the tserver and logger processes for accumulo +# Description: The accumulo tserver process for accumulo ### END INIT INFO # Licensed to the Apache Software Foundation (ASF) under one or more
svn commit: r1477422 - /accumulo/branches/1.5/assemble/scripts/init.d/accumulo-tserver
Author: vines Date: Tue Apr 30 00:26:01 2013 New Revision: 1477422 URL: http://svn.apache.org/r1477422 Log: ACCUMULO-792 - slightly dated description Modified: accumulo/branches/1.5/assemble/scripts/init.d/accumulo-tserver Modified: accumulo/branches/1.5/assemble/scripts/init.d/accumulo-tserver URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/scripts/init.d/accumulo-tserver?rev=1477422&r1=1477421&r2=1477422&view=diff == --- accumulo/branches/1.5/assemble/scripts/init.d/accumulo-tserver (original) +++ accumulo/branches/1.5/assemble/scripts/init.d/accumulo-tserver Tue Apr 30 00:26:01 2013 @@ -1,13 +1,13 @@ #! /bin/sh # chkconfig: 2345 21 15 ### BEGIN INIT INFO -# Provides: accumulo-slave +# Provides: accumulo-tserver # Required-Start: $network $local_fs hadoop-namenode hadoop-datanode zookeeper-server accumulo-master # Required-Stop:$network $local_fs hadoop-datanode hadoop-namenode zookeeper-server accumulo-master # Default-Start:2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: accumulo tserver and logger processes -# Description: The accumulo slaves bundle the tserver and logger processes for accumulo +# Description: The accumulo tserver process for accumulo ### END INIT INFO # Licensed to the Apache Software Foundation (ASF) under one or more
svn commit: r1477421 - in /accumulo/trunk: ./ assemble/ assemble/scripts/init.d/accumulo-slave
Author: vines Date: Tue Apr 30 00:24:41 2013 New Revision: 1477421 URL: http://svn.apache.org/r1477421 Log: ACCUMULO-792 - this file isn't needed anymore Removed: accumulo/trunk/assemble/scripts/init.d/accumulo-slave Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1477414-1477419 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1477414-1477419
svn commit: r1477419 - /accumulo/branches/1.5/assemble/scripts/init.d/accumulo-slave
Author: vines Date: Tue Apr 30 00:22:51 2013 New Revision: 1477419 URL: http://svn.apache.org/r1477419 Log: ACCUMULO-792 - this file isn't needed anymore Removed: accumulo/branches/1.5/assemble/scripts/init.d/accumulo-slave
svn commit: r1477414 - in /accumulo/trunk: ./ assemble/ core/ docs/src/developer_manual/ docs/src/main/ docs/src/main/latex/ docs/src/main/latex/accumulo_developer_manual/ docs/src/main/latex/accumulo
Author: ctubbsii Date: Mon Apr 29 23:32:49 2013 New Revision: 1477414 URL: http://svn.apache.org/r1477414 Log: ACCUMULO-1350, ACCUMULO-1240 merge to trunk Added: accumulo/trunk/docs/src/main/ - copied from r1477413, accumulo/branches/1.5/docs/src/main/ accumulo/trunk/docs/src/main/latex/ - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/ accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/ (props changed) - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/ accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/component_docs.odp - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/component_docs.odp accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/ - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/ accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/component_overview.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/component_overview.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/system_blocks.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/system_blocks.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tablet_dataflow.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tablet_dataflow.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tablet_hierarchy.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tablet_hierarchy.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_config.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_config.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_maintenance.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_maintenance.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_monitor.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_monitor.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_recovery.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_recovery.jpg accumulo/trunk/docs/src/main/latex/accumulo_developer_manual/images/tserver_rw.jpg - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/images/tserver_rw.jpg accumulo/trunk/docs/src/main/latex/accumulo_user_manual/ (props changed) - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/ accumulo/trunk/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/ (props changed) - copied from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/ accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/analytics.tex accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/clients.tex accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/design.tex - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/design.tex accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/high_speed_ingest.tex - copied unchanged from r1477413, accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/chapters/high_speed_ingest.tex accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/introduction.tex -
svn commit: r1477413 - /accumulo/branches/1.5/assemble/pom.xml
Author: ctubbsii
Date: Mon Apr 29 23:24:21 2013
New Revision: 1477413
URL: http://svn.apache.org/r1477413
Log:
ACCUMULO-1350 minor pom oversight
Modified:
accumulo/branches/1.5/assemble/pom.xml
Modified: accumulo/branches/1.5/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1477413&r1=1477412&r2=1477413&view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Mon Apr 29 23:24:21 2013
@@ -435,6 +435,30 @@
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-pdf-manuals
+
+ copy-resources
+
+prepare-package
+
+ ../docs
+
+
+ ${project.build.directory}
+
+*.pdf
+
+
+
+
+
+
+
+
org.codehaus.mojo
latex-maven-plugin
@@ -450,30 +474,6 @@
-
-org.apache.maven.plugins
-maven-resources-plugin
-
-
-copy-pdf-manuals
-
- copy-resources
-
-prepare-package
-
- ../docs
-
-
- ${project.build.directory}
-
-*.pdf
-
-
-
-
-
-
-
svn commit: r1477411 - in /accumulo/branches/1.5: ./ assemble/ docs/src/developer_manual/ docs/src/main/ docs/src/main/latex/ docs/src/main/latex/accumulo_developer_manual/ docs/src/main/latex/accumul
Author: ctubbsii
Date: Mon Apr 29 23:20:31 2013
New Revision: 1477411
URL: http://svn.apache.org/r1477411
Log:
ACCUMULO-1350 drop appendix from documentation; ACCUMULO-1240 build docs with
latex-maven-plugin to avoid executing shell scripts
Added:
accumulo/branches/1.5/docs/src/main/
accumulo/branches/1.5/docs/src/main/latex/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/
- copied from r1477384, accumulo/branches/1.5/docs/src/developer_manual/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/accumulo_developer_manual.tex
- copied unchanged from r1477384,
accumulo/branches/1.5/docs/src/developer_manual/accumulo_developer_manual.tex
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/
- copied from r1477384, accumulo/branches/1.5/docs/src/user_manual/
accumulo/branches/1.5/docs/src/main/latex/common/
accumulo/branches/1.5/docs/src/main/latex/common/state_diagrams/
- copied from r1477384, accumulo/branches/1.5/docs/src/state_diagrams/
Removed:
accumulo/branches/1.5/docs/src/developer_manual/
accumulo/branches/1.5/docs/src/main/latex/accumulo_developer_manual/build.sh
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/appendices/
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/build.sh
accumulo/branches/1.5/docs/src/state_diagrams/
accumulo/branches/1.5/docs/src/user_manual/
Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
accumulo/branches/1.5/pom.xml
Modified: accumulo/branches/1.5/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1477411&r1=1477410&r2=1477411&view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Mon Apr 29 23:20:31 2013
@@ -436,36 +436,44 @@
org.codehaus.mojo
-exec-maven-plugin
+latex-maven-plugin
-developer-manual
+build-pdf-manuals
- exec
+ latex
-prepare-package
+compile
- bash
-
-../docs/src/developer_manual/build.sh
-
-
-
-
-user-manual
-
- exec
-
-prepare-package
-
- bash
-
-../docs/src/user_manual/build.sh
-
+ ../docs/src/main/latex
+
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-pdf-manuals
+
+ copy-resources
+
+prepare-package
+
+ ../docs
+
+
+ ${project.build.directory}
+
+*.pdf
+
+
+
+
+
+
+
Modified:
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex?rev=1477411&r1=1477384&r2=1477411&view=diff
==
---
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
(original)
+++
accumulo/branches/1.5/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
Mon Apr 29 23:20:31 2013
@@ -49,6 +49,4 @@ Version 1.5}
\include{chapters/analytics}
\include{chapters/security}
\include{chapters/administration}
-\appendix
-\include{appendices/shell_commands}
\end{document}
Modified: accumulo/branches/1.5/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1477411&r1=1477410&r2=1477411&view=diff
==
--- accumulo/branches/1.5/pom.xml (original)
+++ accumulo/branches/1.5/pom.xml Mon Apr 29 23:20:31 2013
@@ -477,6 +477,11 @@
org.codehaus.mojo
+ latex-maven-plugin
+ 1.1
+
+
+ org.codehaus.mojo
rpm-maven-plugin
2.1-alpha-2
svn commit: r1477405 - in /accumulo/trunk: ./ start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
Author: vines Date: Mon Apr 29 23:03:19 2013 New Revision: 1477405 URL: http://svn.apache.org/r1477405 Log: ACCUMULO-1321 - accidently commit a change to reloader time Modified: accumulo/trunk/ (props changed) accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1477404 Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java URL: http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java?rev=1477405&r1=1477404&r2=1477405&view=diff == --- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java (original) +++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java Mon Apr 29 23:03:19 2013 @@ -38,7 +38,7 @@ public class AccumuloReloadingVFSClassLo private static final Logger log = Logger.getLogger(AccumuloReloadingVFSClassLoader.class); /* 5 minute timeout */ - private static final int DEFAULT_TIMEOUT = 1000; + private static final int DEFAULT_TIMEOUT = 60; private String uris; private FileObject[] files;
svn commit: r1477404 - /accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
Author: vines Date: Mon Apr 29 23:02:41 2013 New Revision: 1477404 URL: http://svn.apache.org/r1477404 Log: ACCUMULO-1321 - accidently commit a change to reloader time Modified: accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java Modified: accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java?rev=1477404&r1=1477403&r2=1477404&view=diff == --- accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java (original) +++ accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java Mon Apr 29 23:02:41 2013 @@ -38,7 +38,7 @@ public class AccumuloReloadingVFSClassLo private static final Logger log = Logger.getLogger(AccumuloReloadingVFSClassLoader.class); /* 5 minute timeout */ - private static final int DEFAULT_TIMEOUT = 1000; + private static final int DEFAULT_TIMEOUT = 60; private String uris; private FileObject[] files;
svn commit: r1477382 - in /accumulo/trunk: ./ start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java start/src/main/java/org/apache/accumulo/start/classload
Author: vines
Date: Mon Apr 29 22:18:56 2013
New Revision: 1477382
URL: http://svn.apache.org/r1477382
Log:
ACCUMULO-1321 - temporary fix. This will create a new vfs classloader in place,
but it leaves cruft
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1477380
Modified:
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java?rev=1477382&r1=1477381&r2=1477382&view=diff
==
---
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
(original)
+++
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
Mon Apr 29 22:18:56 2013
@@ -38,7 +38,7 @@ public class AccumuloReloadingVFSClassLo
private static final Logger log =
Logger.getLogger(AccumuloReloadingVFSClassLoader.class);
/* 5 minute timeout */
- private static final int DEFAULT_TIMEOUT = 30;
+ private static final int DEFAULT_TIMEOUT = 1000;
private String uris;
private FileObject[] files;
@@ -47,13 +47,28 @@ public class AccumuloReloadingVFSClassLo
private DefaultFileMonitor monitor = null;
private VFSClassLoader cl = null;
private boolean preDelegate;
+ public String stringify(FileObject[] files) {
+StringBuilder sb = new StringBuilder();
+sb.append('[');
+String delim = "";
+for (FileObject file : files) {
+ sb.append(delim);
+ delim = ", ";
+ sb.append(file.getName());
+}
+sb.append(']');
+return sb.toString();
+ }
@Override
public synchronized ClassLoader getClassLoader() {
if (cl == null || cl.getParent() != parent.getClassLoader()) {
try {
+vfs = AccumuloVFSClassLoader.generateVfs(true);
files = AccumuloVFSClassLoader.resolve(vfs, uris);
-
+
+log.debug("Rebuilding dynamic classloader using files- " +
stringify(files));
+
if (preDelegate)
cl = new VFSClassLoader(files, vfs, parent.getClassLoader());
else
Modified:
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java?rev=1477382&r1=1477381&r2=1477382&view=diff
==
---
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
(original)
+++
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
Mon Apr 29 22:18:56 2013
@@ -59,12 +59,12 @@ import org.apache.log4j.Logger;
public class AccumuloVFSClassLoader {
public static class AccumuloVFSClassLoaderShutdownThread implements Runnable
{
-
+
public void run() {
try {
- AccumuloVFSClassLoader.close();
+AccumuloVFSClassLoader.close();
} catch (Exception e) {
- //do nothing, we are shutting down anyway
+// do nothing, we are shutting down anyway
}
}
@@ -73,7 +73,7 @@ public class AccumuloVFSClassLoader {
public static final String DYNAMIC_CLASSPATH_PROPERTY_NAME =
"general.dynamic.classpaths";
public static final String DEFAULT_DYNAMIC_CLASSPATH_VALUE =
"$ACCUMULO_HOME/lib/ext/[^.].*.jar\n";
-
+
public static final String VFS_CLASSLOADER_SYSTEM_CLASSPATH_PROPERTY =
"general.vfs.classpaths";
public static final String VFS_CONTEXT_CLASSPATH_PROPERTY =
"general.vfs.context.classpath.";
@@ -84,14 +84,14 @@ public class AccumuloVFSClassLoader {
private static ClassLoader parent = null;
private static volatile ReloadingClassLoader loader = null;
private static final Object lock = new Object();
-
+
private static ContextManager contextManager;
-
+
private static Logger log = Logger.getLogger(AccumuloVFSClassLoader.class);
static {
// Register the shutdown hook
-Runtime.getRuntime().addShutdownHook(new Thread(new
AccumuloVFSClassLoaderShutdownThread()));
+Runtime.getRuntime().addShutdownHook(new Thread(new
AccumuloVFSClassLoaderShutdownThread()));
}
public synchronized static Class loadClass(String
classname, Class extension) throws ClassNotFoundException {
@@ -105,28 +105,28 @@ public class AccumuloVFSClassLoader
svn commit: r1477380 - in /accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs: AccumuloReloadingVFSClassLoader.java AccumuloVFSClassLoader.java
Author: vines
Date: Mon Apr 29 22:18:02 2013
New Revision: 1477380
URL: http://svn.apache.org/r1477380
Log:
ACCUMULO-1321 - temporary fix. This will create a new vfs classloader in place,
but it leaves cruft
Modified:
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
Modified:
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java?rev=1477380&r1=1477379&r2=1477380&view=diff
==
---
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
(original)
+++
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoader.java
Mon Apr 29 22:18:02 2013
@@ -38,7 +38,7 @@ public class AccumuloReloadingVFSClassLo
private static final Logger log =
Logger.getLogger(AccumuloReloadingVFSClassLoader.class);
/* 5 minute timeout */
- private static final int DEFAULT_TIMEOUT = 30;
+ private static final int DEFAULT_TIMEOUT = 1000;
private String uris;
private FileObject[] files;
@@ -47,13 +47,28 @@ public class AccumuloReloadingVFSClassLo
private DefaultFileMonitor monitor = null;
private VFSClassLoader cl = null;
private boolean preDelegate;
+ public String stringify(FileObject[] files) {
+StringBuilder sb = new StringBuilder();
+sb.append('[');
+String delim = "";
+for (FileObject file : files) {
+ sb.append(delim);
+ delim = ", ";
+ sb.append(file.getName());
+}
+sb.append(']');
+return sb.toString();
+ }
@Override
public synchronized ClassLoader getClassLoader() {
if (cl == null || cl.getParent() != parent.getClassLoader()) {
try {
+vfs = AccumuloVFSClassLoader.generateVfs(true);
files = AccumuloVFSClassLoader.resolve(vfs, uris);
-
+
+log.debug("Rebuilding dynamic classloader using files- " +
stringify(files));
+
if (preDelegate)
cl = new VFSClassLoader(files, vfs, parent.getClassLoader());
else
Modified:
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java?rev=1477380&r1=1477379&r2=1477380&view=diff
==
---
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
(original)
+++
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
Mon Apr 29 22:18:02 2013
@@ -59,12 +59,12 @@ import org.apache.log4j.Logger;
public class AccumuloVFSClassLoader {
public static class AccumuloVFSClassLoaderShutdownThread implements Runnable
{
-
+
public void run() {
try {
- AccumuloVFSClassLoader.close();
+AccumuloVFSClassLoader.close();
} catch (Exception e) {
- //do nothing, we are shutting down anyway
+// do nothing, we are shutting down anyway
}
}
@@ -73,7 +73,7 @@ public class AccumuloVFSClassLoader {
public static final String DYNAMIC_CLASSPATH_PROPERTY_NAME =
"general.dynamic.classpaths";
public static final String DEFAULT_DYNAMIC_CLASSPATH_VALUE =
"$ACCUMULO_HOME/lib/ext/[^.].*.jar\n";
-
+
public static final String VFS_CLASSLOADER_SYSTEM_CLASSPATH_PROPERTY =
"general.vfs.classpaths";
public static final String VFS_CONTEXT_CLASSPATH_PROPERTY =
"general.vfs.context.classpath.";
@@ -84,14 +84,14 @@ public class AccumuloVFSClassLoader {
private static ClassLoader parent = null;
private static volatile ReloadingClassLoader loader = null;
private static final Object lock = new Object();
-
+
private static ContextManager contextManager;
-
+
private static Logger log = Logger.getLogger(AccumuloVFSClassLoader.class);
static {
// Register the shutdown hook
-Runtime.getRuntime().addShutdownHook(new Thread(new
AccumuloVFSClassLoaderShutdownThread()));
+Runtime.getRuntime().addShutdownHook(new Thread(new
AccumuloVFSClassLoaderShutdownThread()));
}
public synchronized static Class loadClass(String
classname, Class extension) throws ClassNotFoundException {
@@ -105,28 +105,28 @@ public class AccumuloVFSClassLoader {
public static Class loadClass(String classname) throws
ClassNotFoundException {
return loadClass(classname,
svn commit: r1477350 - in /accumulo/trunk: ./ assemble/ assemble/src/ assemble/src/main/ assemble/src/main/assemblies/ contrib/ core/ core/src/main/java-filtered/ core/src/main/java-filtered/org/ core
Author: ctubbsii
Date: Mon Apr 29 21:25:33 2013
New Revision: 1477350
URL: http://svn.apache.org/r1477350
Log:
ACCUMULO-1271, ACCUMULO-370, ACCUMULO-1343, ACCUMULO-1181 merge to trunk
Added:
accumulo/trunk/assemble/src/
- copied from r1477345, accumulo/branches/1.5/assemble/src/
accumulo/trunk/assemble/src/main/
- copied from r1477345, accumulo/branches/1.5/assemble/src/main/
accumulo/trunk/assemble/src/main/assemblies/
- copied from r1477345,
accumulo/branches/1.5/assemble/src/main/assemblies/
accumulo/trunk/assemble/src/main/assemblies/bin.xml
- copied unchanged from r1477345,
accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml
accumulo/trunk/contrib/dotfile-rpmmacros
- copied unchanged from r1477345,
accumulo/branches/1.5/contrib/dotfile-rpmmacros
accumulo/trunk/core/src/main/java-filtered/
- copied from r1477345, accumulo/branches/1.5/core/src/main/java-filtered/
accumulo/trunk/core/src/main/java-filtered/org/
- copied from r1477345,
accumulo/branches/1.5/core/src/main/java-filtered/org/
accumulo/trunk/core/src/main/java-filtered/org/apache/
- copied from r1477345,
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/
accumulo/trunk/core/src/main/java-filtered/org/apache/accumulo/
- copied from r1477345,
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/
accumulo/trunk/core/src/main/java-filtered/org/apache/accumulo/core/
- copied from r1477345,
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/core/
accumulo/trunk/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
- copied unchanged from r1477345,
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
Removed:
accumulo/trunk/assemble/dist.xml
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/README
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/build.sh
accumulo/trunk/assemble/pom.xml
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/pom.xml
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/trunk/docs/src/developer_manual/build.sh
accumulo/trunk/docs/src/user_manual/build.sh
accumulo/trunk/docs/src/user_manual/chapters/administration.tex
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/pom.xml (contents, props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1471673-1476219,1476221-1477345
Modified: accumulo/trunk/README
URL:
http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1477350&r1=1477349&r2=1477350&view=diff
==
--- accumulo/trunk/README (original)
+++ accumulo/trunk/README Mon Apr 29 21:25:33 2013
@@ -44,7 +44,7 @@ easier to install.
Copy the accumulo tar file produced by mvn package from the assemble/target/
directory to the desired destination, then untar it (e.g.
-tar xzf apache-accumulo-1.6.0-SNAPSHOT-dist.tar.gz).
+tar xzf accumulo-assemble-1.6.0-bin.tar.gz).
If you are using the RPM, install the RPM on every machine that will run
accumulo.
Propchange: accumulo/trunk/assemble/
--
Merged /accumulo/branches/1.5/assemble:r1471673-1476219,1476221-1477345
Modified: accumulo/trunk/assemble/build.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/build.sh?rev=1477350&r1=1477349&r2=1477350&view=diff
==
--- accumulo/trunk/assemble/build.sh (original)
+++ accumulo/trunk/assemble/build.sh Mon Apr 29 21:25:33 2013
@@ -38,13 +38,48 @@ runAt() {
( cd $1 ; echo in `pwd`; shift ; run $@ ) || fail
}
-run mvn -U clean
-mvn rat:check
-COUNT=`grep '!' target/rat.txt | wc -l`
-EXPECTED=53
-if [ "$COUNT" -ne $EXPECTED ]
-then
- fail expected $EXPECTED files missing licenses, but saw "$COUNT"
+# Allow skipping tests; This option is not possible
+# with the --create-release-candidate option
+if [[ $1 != '--skipTests' ]]; then
+ # Run all tests with Hadoop 1.0.x
+ run mvn clean
+ run mvn verify
+
+ # Run all tests with Hadoop 2.0.x
+ run mvn clean
+ run mvn verify -Dhadoop.profile=2.0
+fi
+
+# Build and stage release artifacts; dryRun is assumed, unless
+# this script is executed with --create-release-candidate flag.
+DRYRUN='-DdryRun'
+if [[ $1 = '--create-release-candidate' ]]; then
+ DRYRUN=''
+fi
+
+# make sure gpg agent has
svn commit: r1477338 - in /accumulo/branches/1.5: ./ assemble/ assemble/src/ assemble/src/main/ assemble/src/main/assemblies/ contrib/ core/ core/src/main/java-filtered/ core/src/main/java-filtered/or
Author: ctubbsii
Date: Mon Apr 29 20:58:56 2013
New Revision: 1477338
URL: http://svn.apache.org/r1477338
Log:
ACCUMULO-1271 Make version derived from build (no more sed to update version
numbers) to reduce steps in releasing; configure necessary properties; update
assemble/build.sh; remove warnings from tarball assembly; obsolete
assemble/build.sh invocation of rat plugin (ACCUMULO-1181); use classifiers for
assemble artifacts and move assembly descriptor to subdirectory; make rpm
plugin do gpg signing with gpg-agent; fix license info for rpm; add
license/notice files to rpm; remove custom file output names for deb since
they're attached to the build anyway; updated documentation
Added:
accumulo/branches/1.5/assemble/src/
accumulo/branches/1.5/assemble/src/main/
accumulo/branches/1.5/assemble/src/main/assemblies/
accumulo/branches/1.5/assemble/src/main/assemblies/bin.xml
- copied, changed from r1475757, accumulo/branches/1.5/assemble/dist.xml
accumulo/branches/1.5/contrib/dotfile-rpmmacros
accumulo/branches/1.5/core/src/main/java-filtered/
accumulo/branches/1.5/core/src/main/java-filtered/org/
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/core/
accumulo/branches/1.5/core/src/main/java-filtered/org/apache/accumulo/core/FilteredConstants.java
Removed:
accumulo/branches/1.5/assemble/dist.xml
Modified:
accumulo/branches/1.5/README
accumulo/branches/1.5/assemble/build.sh
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/branches/1.5/docs/src/user_manual/chapters/administration.tex
accumulo/branches/1.5/pom.xml
Modified: accumulo/branches/1.5/README
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/README?rev=1477338&r1=1477337&r2=1477338&view=diff
==
--- accumulo/branches/1.5/README (original)
+++ accumulo/branches/1.5/README Mon Apr 29 20:58:56 2013
@@ -44,7 +44,7 @@ easier to install.
Copy the accumulo tar file produced by mvn package from the assemble/target/
directory to the desired destination, then untar it (e.g.
-tar xzf apache-accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
+tar xzf accumulo-assemble-1.5.0-bin.tar.gz).
If you are using the RPM, install the RPM on every machine that will run
accumulo.
Modified: accumulo/branches/1.5/assemble/build.sh
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/build.sh?rev=1477338&r1=1477337&r2=1477338&view=diff
==
--- accumulo/branches/1.5/assemble/build.sh (original)
+++ accumulo/branches/1.5/assemble/build.sh Mon Apr 29 20:58:56 2013
@@ -38,13 +38,48 @@ runAt() {
( cd $1 ; echo in `pwd`; shift ; run $@ ) || fail
}
-run mvn -U clean
-mvn rat:check
-COUNT=`grep '!' target/rat.txt | wc -l`
-EXPECTED=53
-if [ "$COUNT" -ne $EXPECTED ]
-then
- fail expected $EXPECTED files missing licenses, but saw "$COUNT"
+# Allow skipping tests; This option is not possible
+# with the --create-release-candidate option
+if [[ $1 != '--skipTests' ]]; then
+ # Run all tests with Hadoop 1.0.x
+ run mvn clean
+ run mvn verify
+
+ # Run all tests with Hadoop 2.0.x
+ run mvn clean
+ run mvn verify -Dhadoop.profile=2.0
+fi
+
+# Build and stage release artifacts; dryRun is assumed, unless
+# this script is executed with --create-release-candidate flag.
+DRYRUN='-DdryRun'
+if [[ $1 = '--create-release-candidate' ]]; then
+ DRYRUN=''
+fi
+
+# make sure gpg agent has key cached; TODO prompt for key instead of using
default
+# if you want the RPM signed, copy contrib/dotfiles-rpmmacros to
$HOME/.rpmmacros
+TESTFILE=/tmp/${USER}-gpgTestFile.txt
+touch "${TESTFILE}" && gpg --sign "${TESTFILE}" && rm -f "${TESTFILE}"
"${TESTFILE}.gpg"
+
+run mvn clean release:clean release:prepare $DRYRUN
+run mvn release:perform $DRYRUN
+
+if [[ $DRYRUN = '-DdryRun' ]]; then
+ echo '**'
+ echo ' You performed a dryRun release. To tag and'
+ echo ' stage a real release candidate for a vote,'
+ echo ' execute this script as:'
+ echo "$0 --create-release-candidate"
+ echo '**'
+else
+ echo '**'
+ echo ' You\'ve successfully tagged and staged a'
+ echo ' release candidate. If the vote succeeds, rename'
+ echo ' the release candidate to its final name,'
+ echo ' promote the staging repository, copy the'
+ echo ' artifacts to the dist svn, update the web page,'
+ echo ' and create a release announcement for the'
+ echo ' mailing lists.'
+ echo '*
svn commit: r1477263 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
Author: ecn
Date: Mon Apr 29 18:44:29 2013
New Revision: 1477263
URL: http://svn.apache.org/r1477263
Log:
ACCUMULO-1356 applying patch from Tim Reardon to paginate tables output
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java?rev=1477263&r1=1477262&r2=1477263&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TablesCommand.java
Mon Apr 29 18:44:29 2013
@@ -17,7 +17,10 @@
package org.apache.accumulo.core.util.shell.commands;
import java.io.IOException;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -26,25 +29,40 @@ import org.apache.accumulo.core.util.she
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
+import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
public class TablesCommand extends Command {
private Option tableIdOption;
+ private Option disablePaginationOpt;
+ @SuppressWarnings("unchecked")
@Override
public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws AccumuloException, AccumuloSecurityException,
IOException {
if (cl.hasOption(tableIdOption.getOpt())) {
- final Map tableIds =
shellState.getConnector().tableOperations().tableIdMap();
- for (String tableName :
shellState.getConnector().tableOperations().list()) {
-shellState.getReader().printString(String.format("%-15s => %10s%n",
tableName, tableIds.get(tableName)));
- }
+ final Map tableIds = new
TreeMap(shellState.getConnector().tableOperations().tableIdMap());
+ shellState.printLines(new
TableIdIterator(tableIds.entrySet().iterator()),
!cl.hasOption(disablePaginationOpt.getOpt()));
} else {
- for (String table : shellState.getConnector().tableOperations().list()) {
-shellState.getReader().printString(table + "\n");
- }
+
shellState.printLines(shellState.getConnector().tableOperations().list().iterator(),
!cl.hasOption(disablePaginationOpt.getOpt()));
}
return 0;
}
+ /**
+ * Decorator that formats table id and name for display.
+ */
+ private static final class TableIdIterator extends AbstractIteratorDecorator
{
+public TableIdIterator(Iterator> iterator) {
+ super(iterator);
+}
+
+@SuppressWarnings("rawtypes")
+@Override
+public Object next() {
+ Entry entry = (Entry) super.next();
+ return String.format("%-15s => %10s%n", entry.getKey(),
entry.getValue());
+}
+ }
+
@Override
public String description() {
return "displays a list of all existing tables";
@@ -55,6 +73,8 @@ public class TablesCommand extends Comma
final Options o = new Options();
tableIdOption = new Option("l", "list-ids", false, "display internal table
ids along with the table name");
o.addOption(tableIdOption);
+disablePaginationOpt = new Option("np", "no-pagination", false, "disable
pagination of output");
+o.addOption(disablePaginationOpt);
return o;
}
svn commit: r1477233 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/util/shell/Shell.java test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Author: ecn
Date: Mon Apr 29 17:52:05 2013
New Revision: 1477233
URL: http://svn.apache.org/r1477233
Log:
ACCUMULO-1347 applying patch from Tim Reardon for comments in the shell
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1477233&r1=1477232&r2=1477233&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Mon Apr 29 17:52:05 2013
@@ -162,6 +162,7 @@ public class Shell extends ShellOptions
public static final String CHARSET = "ISO-8859-1";
public static final int NO_FIXED_ARG_LENGTH_CHECK = -1;
+ public static final String COMMENT_PREFIX = "#";
public static final String HISTORY_DIR_NAME = ".accumulo";
public static final String HISTORY_FILE_NAME = "shell_history.txt";
private static final String SHELL_DESCRIPTION = "Shell - Apache Accumulo
Interactive Shell";
@@ -528,6 +529,10 @@ public class Shell extends ShellOptions
reader.printNewline();
}
+if (input.startsWith(COMMENT_PREFIX)) {
+ return;
+}
+
String fields[];
try {
fields = new QuotedStringTokenizer(input).getTokens();
Modified:
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java?rev=1477233&r1=1477232&r2=1477233&view=diff
==
---
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
(original)
+++
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Mon Apr 29 17:52:05 2013
@@ -206,4 +206,12 @@ public class ShellTest {
exec("scan -fm org.apache.accumulo.core.util.format.DateStringFormatter
-st", true, expected);
exec("deletetable t -f", true, "Table: [t] has been deleted");
}
+
+ @Test
+ public void commentTest() throws IOException {
+Shell.log.debug("Starting comment test --");
+exec("#", true, "Unknown command", false);
+exec("# foo", true, "Unknown command", false);
+exec("- foo", true, "Unknown command", true);
+ }
}
svn commit: r1477230 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell: Shell.java commands/HistoryCommand.java
Author: ecn
Date: Mon Apr 29 17:47:08 2013
New Revision: 1477230
URL: http://svn.apache.org/r1477230
Log:
ACCUMULO-1193 applying patch from Tim Reardon to paginate history
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1477230&r1=1477229&r2=1477230&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Mon Apr 29 17:47:08 2013
@@ -162,6 +162,8 @@ public class Shell extends ShellOptions
public static final String CHARSET = "ISO-8859-1";
public static final int NO_FIXED_ARG_LENGTH_CHECK = -1;
+ public static final String HISTORY_DIR_NAME = ".accumulo";
+ public static final String HISTORY_FILE_NAME = "shell_history.txt";
private static final String SHELL_DESCRIPTION = "Shell - Apache Accumulo
Interactive Shell";
private static final String DEFAULT_AUTH_TIMEOUT = "60"; // in minutes
@@ -426,8 +428,8 @@ public class Shell extends ShellOptions
String home = System.getProperty("HOME");
if (home == null)
home = System.getenv("HOME");
-String configDir = home + "/.accumulo";
-String historyPath = configDir + "/shell_history.txt";
+String configDir = home + "/" + HISTORY_DIR_NAME;
+String historyPath = configDir + "/" + HISTORY_FILE_NAME;
File accumuloDir = new File(configDir);
if (!accumuloDir.exists() && !accumuloDir.mkdirs())
log.warn("Unable to make directory for history at " + accumuloDir);
@@ -518,7 +520,6 @@ public class Shell extends ShellOptions
return connector.whoami() + "@" +
connector.getInstance().getInstanceName() + (getTableName().isEmpty() ? "" : "
") + getTableName() + "> ";
}
- @SuppressWarnings("deprecation")
public void execCommand(String input, boolean ignoreAuthTimeout, boolean
echoPrompt) throws IOException {
audit.log(AuditLevel.AUDIT, getDefaultPrompt() + input);
if (echoPrompt) {
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java?rev=1477230&r1=1477229&r2=1477230&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
Mon Apr 29 17:47:08 2013
@@ -16,68 +16,61 @@
*/
package org.apache.accumulo.core.util.shell.commands;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.PrintWriter;
+import java.util.Iterator;
import org.apache.accumulo.core.util.shell.Shell;
import org.apache.accumulo.core.util.shell.Shell.Command;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
+import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.LineIterator;
public class HistoryCommand extends Command {
-
private Option clearHist;
+ private Option disablePaginationOpt;
+ @SuppressWarnings("unchecked")
@Override
- public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws Exception {
-
+ public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws IOException {
String home = System.getProperty("HOME");
if (home == null)
home = System.getenv("HOME");
-final String histDir = home + "/.accumulo";
-int counter = 0;
+final String historyPath = home + "/" + Shell.HISTORY_DIR_NAME + "/" +
Shell.HISTORY_FILE_NAME;
if (cl.hasOption(clearHist.getOpt())) {
-
+ final FileOutputStream out = new FileOutputStream(historyPath);
+ out.close();
+} else {
+ final LineIterator it = FileUtils.lineIterator(new File(historyPath));
try {
-
-final FileWriter outFile = new FileWriter(histDir +
"/shell_history.txt");
-final PrintWriter out = new PrintWriter(outFile);
-out.close();
-
- } catch (IOException e) {
-
-e.printStackTrace();
+shellSt
svn commit: r860316 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: kturner Date: Mon Apr 29 17:25:35 2013 New Revision: 860316 Log: Publishing svnmucc operation to accumulo site by kturner Added: websites/production/accumulo/content/ - copied from r860315, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r860315, websites/production/accumulo/content/1.4/apidocs/
svn commit: r860314 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Mon Apr 29 17:16:16 2013
New Revision: 860314
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 29 17:16:16 2013
@@ -1 +1 @@
-1468986
+1477207
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Mon Apr 29 17:16:16 2013
@@ -160,6 +160,7 @@ tr:nth-child(2n+1) {
Oren Falkowitzhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Phil Eberhardthttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Philip Young
+ Pushpinder Heerhttp://www.atsid.com/>Applied Technical SystemsPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8
/ http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7)
Sapah Shah
Scott Kuehn
supunSupun Kamburugamuva
svn commit: r1477207 - /accumulo/site/trunk/content/people.mdtext
Author: kturner Date: Mon Apr 29 17:14:55 2013 New Revision: 1477207 URL: http://svn.apache.org/r1477207 Log: CMS commit to accumulo by kturner Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1477207&r1=1477206&r2=1477207&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Mon Apr 29 17:14:55 2013 @@ -92,6 +92,7 @@ Contributors Oren Falkowitzhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Phil Eberhardthttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Philip Young + Pushpinder Heerhttp://www.atsid.com/>Applied Technical SystemsPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8 / http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7) Sapah Shah Scott Kuehn supunSupun Kamburugamuva
