diff --git a/pom.xml b/pom.xml index 2982562f6c2..bbfd20ff8dd 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,9 @@ taskqueue/deferred unittests bigquery - cloud-storage/xml-api/cmdline-sample - cloud-storage/xml-api/serviceaccount-appengine-sample - cloud-storage/storage-transfer + storage/xml-api/cmdline-sample + storage/xml-api/serviceaccount-appengine-sample + storage/storage-transfer monitoring diff --git a/cloud-storage/json-api/pom.xml b/storage/json-api/pom.xml similarity index 100% rename from cloud-storage/json-api/pom.xml rename to storage/json-api/pom.xml diff --git a/cloud-storage/json-api/src/main/java/StorageSample.java b/storage/json-api/src/main/java/StorageSample.java similarity index 100% rename from cloud-storage/json-api/src/main/java/StorageSample.java rename to storage/json-api/src/main/java/StorageSample.java diff --git a/cloud-storage/json-api/src/test/java/StorageSampleTest.java b/storage/json-api/src/test/java/StorageSampleTest.java similarity index 100% rename from cloud-storage/json-api/src/test/java/StorageSampleTest.java rename to storage/json-api/src/test/java/StorageSampleTest.java diff --git a/cloud-storage/storage-transfer/README.md b/storage/storage-transfer/README.md similarity index 100% rename from cloud-storage/storage-transfer/README.md rename to storage/storage-transfer/README.md diff --git a/cloud-storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml similarity index 100% rename from cloud-storage/storage-transfer/pom.xml rename to storage/storage-transfer/pom.xml diff --git a/cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java similarity index 100% rename from cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java rename to storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java diff --git a/cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java similarity index 100% rename from cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java rename to storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java diff --git a/cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java similarity index 100% rename from cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java rename to storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java diff --git a/cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java similarity index 100% rename from cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java rename to storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java diff --git a/cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java similarity index 100% rename from cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java rename to storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java diff --git a/cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java similarity index 100% rename from cloud-storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java rename to storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java diff --git a/cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java similarity index 100% rename from cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java rename to storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java diff --git a/cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java similarity index 100% rename from cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java rename to storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java diff --git a/cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java similarity index 100% rename from cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java rename to storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java diff --git a/cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferClientCreatorTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferClientCreatorTest.java similarity index 100% rename from cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferClientCreatorTest.java rename to storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferClientCreatorTest.java diff --git a/cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java similarity index 100% rename from cloud-storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java rename to storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java diff --git a/cloud-storage/xml-api/README.md b/storage/xml-api/README.md similarity index 91% rename from cloud-storage/xml-api/README.md rename to storage/xml-api/README.md index 8b74056c7c7..fd8a78632ba 100644 --- a/cloud-storage/xml-api/README.md +++ b/storage/xml-api/README.md @@ -1,4 +1,4 @@ -java-docs-samples/cloud-storage XML API Examples +java-docs-samples/storage XML API Examples =================================== Samples used in Google Cloud Storage documentation (https://developers.google.com/storage/docs/xml-api-java-samples). diff --git a/cloud-storage/xml-api/cmdline-sample/README.md b/storage/xml-api/cmdline-sample/README.md similarity index 92% rename from cloud-storage/xml-api/cmdline-sample/README.md rename to storage/xml-api/cmdline-sample/README.md index 508a9660238..1b68e0460fe 100644 --- a/cloud-storage/xml-api/cmdline-sample/README.md +++ b/storage/xml-api/cmdline-sample/README.md @@ -6,7 +6,7 @@ Using the Command Line Sample Browse Online -------------- -The main file is [StorageSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/cloud-storage/xml-api/cmdline-sample/src/main/java/StorageSample.java). +The main file is [StorageSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/storage/xml-api/cmdline-sample/src/main/java/StorageSample.java). Setup @@ -31,7 +31,7 @@ Command-line Instructions * You may need to set your `JAVA_HOME`. ```bash -cd java-docs-samples/cloud-storage/xml-api/cmdline-sample +cd java-docs-samples/storage/xml-api/cmdline-sample # Compile and run mvn compile install mvn -q exec:java -Dexec.args="your-bucket-name" @@ -55,7 +55,7 @@ Eclipse Instructions * check on "Download Artifact Sources" * check on "Download Artifact JavaDoc" -* Create a new project using `cloud-storage/xml-api/cmdline-sample` +* Create a new project using `storage/xml-api/cmdline-sample` * Create a new Java Project. * Choose the **Location** of the project to be the location of `cmdline-sample` diff --git a/cloud-storage/xml-api/cmdline-sample/logging.properties b/storage/xml-api/cmdline-sample/logging.properties similarity index 100% rename from cloud-storage/xml-api/cmdline-sample/logging.properties rename to storage/xml-api/cmdline-sample/logging.properties diff --git a/cloud-storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml similarity index 100% rename from cloud-storage/xml-api/cmdline-sample/pom.xml rename to storage/xml-api/cmdline-sample/pom.xml diff --git a/cloud-storage/xml-api/cmdline-sample/src/main/java/StorageSample.java b/storage/xml-api/cmdline-sample/src/main/java/StorageSample.java similarity index 100% rename from cloud-storage/xml-api/cmdline-sample/src/main/java/StorageSample.java rename to storage/xml-api/cmdline-sample/src/main/java/StorageSample.java diff --git a/cloud-storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java b/storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java similarity index 100% rename from cloud-storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java rename to storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/README.md b/storage/xml-api/serviceaccount-appengine-sample/README.md similarity index 88% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/README.md rename to storage/xml-api/serviceaccount-appengine-sample/README.md index d27cd28ca29..78f8fb99461 100644 --- a/cloud-storage/xml-api/serviceaccount-appengine-sample/README.md +++ b/storage/xml-api/serviceaccount-appengine-sample/README.md @@ -4,7 +4,7 @@ Using the Service Account App Engine Sample Browse Online ------------- -The main code file is [StorageSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/java/StorageServiceAccountSample.java). +The main code file is [StorageSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/storage/xml-api/serviceaccount-appengine-sample/src/main/java/StorageServiceAccountSample.java). Add Your App Engine Service Account Name to the Project Team ------------------------------------------------------------ @@ -22,10 +22,10 @@ https://help.github.com/articles/set-up-git). cd [someDirectory] git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git - cd java-docs-samples/cloud-storage/xml-api/serviceaccount-appengine-sample + cd java-docs-samples/storage/xml-api/serviceaccount-appengine-sample mvn clean package -To enable logging of HTTP requests and responses (highly recommended when +To enable logging of HTTP requests and responses (highly recommended when developing), please take a look at logging.properties. Running and Deploying Your Application from the Command Line @@ -45,7 +45,7 @@ If this is the first time you are deploying your application to appspot.com, you If you've done the above, you can deploy at any time: mvn appengine:update - + If this is the first time you have run "update" on the project, a browser window will open prompting you to log in. Log in with the same Google account the app is registered with. Set Up a Project in Eclipse diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/pom.xml b/storage/xml-api/serviceaccount-appengine-sample/pom.xml similarity index 100% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/pom.xml rename to storage/xml-api/serviceaccount-appengine-sample/pom.xml diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java b/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java similarity index 100% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java rename to storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties b/storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties similarity index 100% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties rename to storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/appengine-web.xml b/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/appengine-web.xml similarity index 100% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/appengine-web.xml rename to storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/appengine-web.xml diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/logging.properties b/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/logging.properties similarity index 100% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/logging.properties rename to storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/logging.properties diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml b/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml rename to storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml diff --git a/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/xsl/listing.xsl b/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/xsl/listing.xsl similarity index 100% rename from cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/xsl/listing.xsl rename to storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/xsl/listing.xsl