Merge branch 'master' into SCREENSHOTS

simonmartinecon · simonmartinecon · commit 3a3b67e8c083 · 2012-05-11T00:01:39.000+02:00
diff --git a/README.md b/README.md
@@ -9,10 +9,16 @@ This repository contains sample projects illustrating usage of [Spring for Andro
 See the README in each directory for more information on the sample project and additional instructions.
 
 * spring-android-showcase - The showcase contains client and server apps, and illustrates the features of Spring for Android.
-![Screenshot](spring-android-showcase/screenshot001.png)
+![Initial screen](spring-android-samples/raw/master/spring-android-showcase/screenshot01.png)
+![HTTP GET options](spring-android-samples/raw/master/spring-android-showcase/screenshot-http-get.png)
+![Twitter Timeline](spring-android-samples/raw/master/spring-android-showcase/screenshot-twitter-timeline.png)
 * spring-android-news-reader - The news reader highlights the use of the Android ROME Feed Reader by retrieving RSS and Atom news feeds.
+![Initial screen](spring-android-samples/raw/master/spring-android-showcase/screenshot01.png)
+![Activity Streams](spring-android-samples/raw/master/spring-android-showcase/screenshot02.png)
 * spring-android-twitter-search - The Twitter search app demonstrates an Android project including Spring for Android jars without the use of Maven's dependency management.
+![Search results](spring-android-samples/raw/master/spring-android-twitter-search/screenshot01.png)
 * spring-android-basic-auth - These client and server applications show how to make Basic Auth requests using RestTemplate on Android and connecting to a Spring MVC site.
+![Initial screen](spring-android-samples/raw/master/spring-android-twitter-search/screenshot01.png)
 
 ## Development Environment
 
diff --git a/spring-android-basic-auth/README.md b/spring-android-basic-auth/README.md
@@ -46,6 +46,11 @@ This sample includes an Android client and a Spring MVC server. Together these i
 5. Start the sample app:
 
 		$ mvn android:run
-		
+
+6. Log on using "roy" / "spring", as defined in spring-android-samples/spring-android-basic-auth/src/main/resources/security.xml
+
 	_Note: the Android Maven Plugin will attempt to deploy and run the app to all available devices, both emulators and physical devices attached to your computer._
 
+## Screenshots
+
+![Authentication screen](spring-android-samples/raw/master/spring-android-basic-auth/screenshot01.png)
diff --git a/spring-android-showcase/screenshot001.png b/spring-android-showcase/screenshot001.png
