Author: ctubbsii Date: Thu Apr 11 22:00:45 2013 New Revision: 1467112 URL: http://svn.apache.org/r1467112 Log: ACCUMULO-971 merge javadoc fixes to trunk
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/pom.xml accumulo/trunk/server/ (props changed) accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java accumulo/trunk/src/ (props changed) accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1467095-1467109 Propchange: accumulo/trunk/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/assemble:r1467095-1467109 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1467095-1467109 Propchange: accumulo/trunk/examples/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/examples:r1467095-1467109 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:r1467095-1467109 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:r1467095-1467109 Modified: accumulo/trunk/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467112&r1=1467111&r2=1467112&view=diff ============================================================================== --- accumulo/trunk/pom.xml (original) +++ accumulo/trunk/pom.xml Thu Apr 11 22:00:45 2013 @@ -386,7 +386,6 @@ <configuration> <encoding>UTF-8</encoding> <quiet>true</quiet> - <jarOutputDirectory>lib</jarOutputDirectory> <reportOutputDirectory>docs</reportOutputDirectory> <javadocVersion>1.6</javadocVersion> <additionalJOption>-J-Xmx512m</additionalJOption> Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1467095-1467109 Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java?rev=1467112&r1=1467111&r2=1467112&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java Thu Apr 11 22:00:45 2013 @@ -227,7 +227,6 @@ abstract public class BasicServlet exten * Allow the concrete servlet implementation to provide attributes on the body HTML tag, * such as 'onload', which can be used to call Javascript methods on page load. * By default, nothing is specified. - * @return */ protected String getBodyAttributes() { return ""; Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java?rev=1467112&r1=1467111&r2=1467112&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java Thu Apr 11 22:00:45 2013 @@ -94,7 +94,7 @@ public class SecurityOperation { /** * - * @Deprecated not for client use + * @deprecated not for client use */ public SecurityOperation(String instanceId) { ZKUserPath = Constants.ZROOT + "/" + instanceId + "/users"; Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/src:r1467095-1467109 Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java URL: http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java?rev=1467112&r1=1467111&r2=1467112&view=diff ============================================================================== --- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java (original) +++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java Thu Apr 11 22:00:45 2013 @@ -58,8 +58,7 @@ public class HdfsFileProvider extends Ab } /** - * @see org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider# - * doCreateFileSystem(org.apache.commons.vfs2.FileName, org.apache.commons.vfs2.FileSystemOptions) + * @see org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider#doCreateFileSystem(org.apache.commons.vfs2.FileName, org.apache.commons.vfs2.FileSystemOptions) */ @Override protected FileSystem doCreateFileSystem(final FileName rootName, final FileSystemOptions fileSystemOptions) Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java URL: http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java?rev=1467112&r1=1467111&r2=1467112&view=diff ============================================================================== --- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java (original) +++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java Thu Apr 11 22:00:45 2013 @@ -57,7 +57,7 @@ public class HdfsFileSystem extends Abst } /** - * @see org.apache.commons.vfs2.provider.AbstractFileSystem#addCapabilities(java .util.Collection) + * @see org.apache.commons.vfs2.provider.AbstractFileSystem#addCapabilities(java.util.Collection) */ @Override protected void addCapabilities(final Collection<Capability> capabilities) @@ -86,8 +86,7 @@ public class HdfsFileSystem extends Abst } /** - * @see org.apache.commons.vfs2.provider.AbstractFileSystem#createFile(org.apache - * .commons.vfs2.provider.AbstractFileName) + * @see org.apache.commons.vfs2.provider.AbstractFileSystem#createFile(org.apache.commons.vfs2.provider.AbstractFileName) */ @Override protected FileObject createFile(final AbstractFileName name) throws Exception @@ -96,7 +95,7 @@ public class HdfsFileSystem extends Abst } /** - * @see org.apache.commons.vfs2.provider.AbstractFileSystem#resolveFile(org.apache .commons.vfs2.FileName) + * @see org.apache.commons.vfs2.provider.AbstractFileSystem#resolveFile(org.apache.commons.vfs2.FileName) */ @Override public FileObject resolveFile(final FileName name) throws FileSystemException