Merge branch 'master' into release-1.0

README.md

@@ -8,16 +8,16 @@ abstract file system APIs.
 Getting started
 ---------------
 
-The latest release is [1.0-rc1](https://github.com/google/jimfs/releases/tag/v1.0-rc1).
+The latest release is [1.0-rc2](https://github.com/google/jimfs/releases/tag/v1.0-rc2).
 
 It is available in Maven Central as
-[com.google.jimfs:jimfs:1.0-rc1](http://search.maven.org/#artifactdetails%7Ccom.google.jimfs%7Cjimfs%7C1.0-rc1%7Cjar):
+[com.google.jimfs:jimfs:1.0-rc2](http://search.maven.org/#artifactdetails%7Ccom.google.jimfs%7Cjimfs%7C1.0-rc2%7Cjar):
 
 ```xml
 <dependency>
   <groupId>com.google.jimfs</groupId>
   <artifactId>jimfs</artifactId>
-  <version>1.0-rc1</version>
+  <version>1.0-rc2</version>
 </dependency>
 ```
 
@@ -28,8 +28,8 @@ The simplest way to use Jimfs is to just get a new `FileSystem` instance from th
 start using it:
 
 ```java
-import com.google.jimfs.Configuration;
-import com.google.jimfs.Jimfs;
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
 ...
 
 // For a simple file system with Unix-style paths and behavior:

jimfs/pom.xml

@@ -122,7 +122,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package>com.google.jimfs.*</Export-Package>
+            <Export-Package>com.google.common.jimfs.*</Export-Package>
             <Include-Resource>
               META-INF/services=target/classes/META-INF/services
             </Include-Resource>

jimfs/src/main/java/com/google/jimfs/AbstractAttributeView.java → jimfs/src/main/java/com/google/common/jimfs/AbstractAttributeView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/AbstractWatchService.java → jimfs/src/main/java/com/google/common/jimfs/AbstractWatchService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

jimfs/src/main/java/com/google/jimfs/AclAttributeProvider.java → jimfs/src/main/java/com/google/common/jimfs/AclAttributeProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/AttributeCopyOption.java → jimfs/src/main/java/com/google/common/jimfs/AttributeCopyOption.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 /**
  * Options for how to handle copying of file attributes when copying a file.

jimfs/src/main/java/com/google/jimfs/AttributeProvider.java → jimfs/src/main/java/com/google/common/jimfs/AttributeProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/AttributeService.java → jimfs/src/main/java/com/google/common/jimfs/AttributeService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/BasicAttributeProvider.java → jimfs/src/main/java/com/google/common/jimfs/BasicAttributeProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

jimfs/src/main/java/com/google/jimfs/Configuration.java → jimfs/src/main/java/com/google/common/jimfs/Configuration.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.jimfs.Feature.FILE_CHANNEL;
-import static com.google.jimfs.Feature.LINKS;
-import static com.google.jimfs.Feature.SECURE_DIRECTORY_STREAM;
-import static com.google.jimfs.Feature.SYMBOLIC_LINKS;
-import static com.google.jimfs.PathNormalization.CASE_FOLD_ASCII;
-import static com.google.jimfs.PathNormalization.NFC;
-import static com.google.jimfs.PathNormalization.NFD;
+import static com.google.common.jimfs.Feature.FILE_CHANNEL;
+import static com.google.common.jimfs.Feature.LINKS;
+import static com.google.common.jimfs.Feature.SECURE_DIRECTORY_STREAM;
+import static com.google.common.jimfs.Feature.SYMBOLIC_LINKS;
+import static com.google.common.jimfs.PathNormalization.CASE_FOLD_ASCII;
+import static com.google.common.jimfs.PathNormalization.NFC;
+import static com.google.common.jimfs.PathNormalization.NFD;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

jimfs/src/main/java/com/google/jimfs/Directory.java → jimfs/src/main/java/com/google/common/jimfs/Directory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.AbstractIterator;

jimfs/src/main/java/com/google/jimfs/DirectoryEntry.java → jimfs/src/main/java/com/google/common/jimfs/DirectoryEntry.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;

jimfs/src/main/java/com/google/jimfs/DosAttributeProvider.java → jimfs/src/main/java/com/google/common/jimfs/DosAttributeProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/DowngradedDirectoryStream.java → jimfs/src/main/java/com/google/common/jimfs/DowngradedDirectoryStream.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/DowngradedSeekableByteChannel.java → jimfs/src/main/java/com/google/common/jimfs/DowngradedSeekableByteChannel.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/Feature.java → jimfs/src/main/java/com/google/common/jimfs/Feature.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.nio.channels.AsynchronousFileChannel;
 import java.nio.channels.FileChannel;

jimfs/src/main/java/com/google/jimfs/File.java → jimfs/src/main/java/com/google/common/jimfs/File.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/FileFactory.java → jimfs/src/main/java/com/google/common/jimfs/FileFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/FileLookup.java → jimfs/src/main/java/com/google/common/jimfs/FileLookup.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.io.IOException;
 

jimfs/src/main/java/com/google/jimfs/FileSystemState.java → jimfs/src/main/java/com/google/common/jimfs/FileSystemState.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/FileSystemView.java → jimfs/src/main/java/com/google/common/jimfs/FileSystemView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;

jimfs/src/main/java/com/google/jimfs/FileTree.java → jimfs/src/main/java/com/google/common/jimfs/FileTree.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/GlobToRegex.java → jimfs/src/main/java/com/google/common/jimfs/GlobToRegex.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

jimfs/src/main/java/com/google/jimfs/HeapDisk.java → jimfs/src/main/java/com/google/common/jimfs/HeapDisk.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

jimfs/src/main/java/com/google/jimfs/InternalCharMatcher.java → jimfs/src/main/java/com/google/common/jimfs/InternalCharMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.util.Arrays;
 

jimfs/src/main/java/com/google/jimfs/Jimfs.java → jimfs/src/main/java/com/google/common/jimfs/Jimfs.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

jimfs/src/main/java/com/google/jimfs/JimfsAsynchronousFileChannel.java → jimfs/src/main/java/com/google/common/jimfs/JimfsAsynchronousFileChannel.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

jimfs/src/main/java/com/google/jimfs/JimfsFileChannel.java → jimfs/src/main/java/com/google/common/jimfs/JimfsFileChannel.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkPositionIndexes;

jimfs/src/main/java/com/google/jimfs/JimfsFileStore.java → jimfs/src/main/java/com/google/common/jimfs/JimfsFileStore.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;