Update: no longer using service accounts.

Jerjou Cheng · Jerjou Cheng · commit 309d3997f578 · 2015-05-26T11:05:47.000-07:00
diff --git a/cloud-storage/xml-api/README.md b/cloud-storage/xml-api/README.md
@@ -3,6 +3,6 @@ java-docs-samples/cloud-storage XML API Examples
 
 Samples used in Google Cloud Storage documentation (https://developers.google.com/storage/docs/xml-api-java-samples).
 
-- **serviceaccount-cmdline-sample** - Uses a service account private key and client ID to generate credentials to access a specified bucket. 
- 
-- **serviceaccount-appengine-sample** - Uses Google App Engine credentials to access a specified bucket. You must add the App Engine Service Account Name to the Permissions of the project that contains the bucket. 
+- **cmdline-sample** - Uses a [Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials) to access a specified bucket.
+
+- **serviceaccount-appengine-sample** - Uses Google App Engine credentials to access a specified bucket. You must add the App Engine Service Account Name to the Permissions of the project that contains the bucket.
diff --git a/cloud-storage/xml-api/cmdline-sample/README.md b/cloud-storage/xml-api/cmdline-sample/README.md
@@ -1,10 +1,10 @@
-Using the Service Account Command Line Sample
+Using the Command Line Sample
 ==============================================================
 
 Browse Online
 --------------
 
-The main file is [StorageServiceAccountSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/cloud-storage/xml-api/serviceaccount-cmdline-sample/src/main/java/StorageServiceAccountSample.java).
+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).
 
 
 Setup
@@ -29,7 +29,7 @@ Command-line Instructions
     * You may need to set your `JAVA_HOME`.
 
 ```bash
-cd java-docs-samples/cloud-storage/xml-api/serviceaccount-cmdline-sample
+cd java-docs-samples/cloud-storage/xml-api/cmdline-sample
 # Compile and run
 mvn compile install
 mvn -q exec:java -Dexec.args="your-bucket-name"
@@ -53,10 +53,10 @@ Eclipse Instructions
         * check on "Download Artifact Sources"
         * check on "Download Artifact JavaDoc"
 
-* Create a new project using `cloud-storage/xml-api/serviceaccount-cmdline-sample`
+* Create a new project using `cloud-storage/xml-api/cmdline-sample`
 
     * Create a new Java Project.
-    * Choose the **Location** of the project to be the location of `serviceaccount-cmdline-sample`
+    * Choose the **Location** of the project to be the location of `cmdline-sample`
     * Select the project and **Convert to Maven Project** to add Maven Dependencies.
     * Click on Run > Run configurations
         * Navigate to your **Java Application**'s configuration section
@@ -67,4 +67,4 @@ Eclipse Instructions
 
     * Right-click on project
     * Run As > Java Application
-    * If asked, type "StorageServiceAccountSample" and click OK
+    * If asked, type "StorageSample" and click OK
diff --git a/cloud-storage/xml-api/cmdline-sample/key.json b/cloud-storage/xml-api/cmdline-sample/key.json
diff --git a/cloud-storage/xml-api/cmdline-sample/logging.properties b/cloud-storage/xml-api/cmdline-sample/logging.properties
@@ -1,6 +1,6 @@
 # Properties file which configures the operation of the JDK logging facility.
 # The system will look for this config file to be specified as a system property:
-# -Djava.util.logging.config.file=${project_loc:storage-serviceccount-cmdline-sample}/logging.properties
+# -Djava.util.logging.config.file=${project_loc:cmdline-sample}/logging.properties
 
 # Set up the console handler (uncomment "level" to show more fine-grained messages)
 handlers = java.util.logging.ConsoleHandler
diff --git a/cloud-storage/xml-api/cmdline-sample/pom.xml b/cloud-storage/xml-api/cmdline-sample/pom.xml
@@ -19,7 +19,7 @@
           </execution>
         </executions>
         <configuration>
-          <mainClass>StorageServiceAccountSample</mainClass>
+          <mainClass>StorageSample</mainClass>
         </configuration>
       </plugin>
     </plugins>
diff --git a/cloud-storage/xml-api/cmdline-sample/src/main/java/StorageSample.java b/cloud-storage/xml-api/cmdline-sample/src/main/java/StorageSample.java
@@ -39,7 +39,7 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-public class StorageServiceAccountSample {
+public class StorageSample {
 
   /** Global configuration of Google Cloud Storage OAuth 2.0 scope. */
   private static final String STORAGE_SCOPE =
@@ -57,7 +57,7 @@ public static void main(String[] args) {
       String bucketName = args[0];
 
       //[START snippet]
-      // Build a service account credential.
+      // Build an account credential.
       GoogleCredential credential = GoogleCredential.getApplicationDefault()
           .createScoped(Collections.singleton(STORAGE_SCOPE));
 
