From 27dec0710cc7da2d2eda9b49178ca1334fc756d5 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 2 Jun 2009 06:56:59 +0000
Subject: Refactoring to follow the same package naming used in other modules +
 renaming main activity to become search activity and introducing search
 results view

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@780957 13f79535-47bb-0310-9956-ffa450edef68
---
 .../scatours-android-ui/AndroidManifest.xml        |   2 +-
 .../scatours-android-ui/default.properties         |  11 ++
 .../gen/com/scatours/android/R.java                |  33 -----
 .../gen/scatours/android/R.java                    |  34 ++++++
 .../scatours-android-ui/res/layout/main.xml        |  65 ----------
 .../scatours-android-ui/res/layout/search.xml      |  65 ++++++++++
 .../res/layout/search_results.xml                  |   6 +
 .../src/com/scatours/android/TripSearch.java       | 136 ---------------------
 .../src/com/scatours/services/jsonrpc/JSONRpc.java |  63 ----------
 .../src/scatours/SCAToursSearchProxy.java          |  24 +---
 .../src/scatours/android/TripSearch.java           | 134 ++++++++++++++++++++
 .../src/scatours/jsonrpc/JSONRpc.java              |  63 ++++++++++
 12 files changed, 315 insertions(+), 321 deletions(-)
 delete mode 100644 sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
 create mode 100644 sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java
 delete mode 100644 sandbox/travelsample/scatours-android-ui/res/layout/main.xml
 create mode 100644 sandbox/travelsample/scatours-android-ui/res/layout/search.xml
 create mode 100644 sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml
 delete mode 100644 sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
 delete mode 100644 sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java
 create mode 100644 sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
 create mode 100644 sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java

(limited to 'sandbox')

diff --git a/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml b/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml
index b80c5a4151..7bda31e187 100644
--- a/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml
+++ b/sandbox/travelsample/scatours-android-ui/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.scatours.android"
+      package="scatours.android"
       android:versionCode="1"
       android:versionName="1.0">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
diff --git a/sandbox/travelsample/scatours-android-ui/default.properties b/sandbox/travelsample/scatours-android-ui/default.properties
index 4513a1e4fd..6b8ae52b90 100644
--- a/sandbox/travelsample/scatours-android-ui/default.properties
+++ b/sandbox/travelsample/scatours-android-ui/default.properties
@@ -7,5 +7,16 @@
 # "build.properties", and override values to adapt the script to your
 # project structure.
 
+# apk configurations. This property allows creation of APK files with limited
+# resources. For example, if your application contains many locales and
+# you wish to release multiple smaller apks instead of a large one, you can
+# define configuration to create apks with limited language sets.
+# Format is a comma separated list of configuration names. For each
+# configuration, a property will declare the resource configurations to
+# include. Example:
+#     apk-configurations=european,northamerica
+#     apk-config-european=en,fr,it,de,es
+#     apk-config-northamerica=en,es
+apk-configurations=
 # Project target.
 target=android-3
diff --git a/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java b/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
deleted file mode 100644
index 12fdbfa624..0000000000
--- a/sandbox/travelsample/scatours-android-ui/gen/com/scatours/android/R.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.scatours.android;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class id {
-        public static final int btnSearch=0x7f050005;
-        public static final int edit_NumberOfPeople=0x7f050004;
-        public static final int edit_date_end=0x7f050003;
-        public static final int edit_date_start=0x7f050002;
-        public static final int edit_fromLocation=0x7f050000;
-        public static final int edit_toLocation=0x7f050001;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int alert_cancel=0x7f040003;
-        public static final int alert_yes=0x7f040002;
-        public static final int app_name=0x7f040000;
-        public static final int title_search=0x7f040001;
-    }
-}
diff --git a/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java b/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java
new file mode 100644
index 0000000000..cbc020bdba
--- /dev/null
+++ b/sandbox/travelsample/scatours-android-ui/gen/scatours/android/R.java
@@ -0,0 +1,34 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package scatours.android;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class id {
+        public static final int btnSearch=0x7f050005;
+        public static final int edit_NumberOfPeople=0x7f050004;
+        public static final int edit_date_end=0x7f050003;
+        public static final int edit_date_start=0x7f050002;
+        public static final int edit_fromLocation=0x7f050000;
+        public static final int edit_toLocation=0x7f050001;
+    }
+    public static final class layout {
+        public static final int search=0x7f030000;
+        public static final int search_results=0x7f030001;
+    }
+    public static final class string {
+        public static final int alert_cancel=0x7f040003;
+        public static final int alert_yes=0x7f040002;
+        public static final int app_name=0x7f040000;
+        public static final int title_search=0x7f040001;
+    }
+}
diff --git a/sandbox/travelsample/scatours-android-ui/res/layout/main.xml b/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
deleted file mode 100644
index cb7ae6acb6..0000000000
--- a/sandbox/travelsample/scatours-android-ui/res/layout/main.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:orientation="vertical"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="From:" />
-
-    <AutoCompleteTextView android:id="@+id/edit_fromLocation"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="LGW"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="To:"/>
-
-    <AutoCompleteTextView android:id="@+id/edit_toLocation"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="FLR"/>
-        
-     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Start Date:" />
-        
-     <AutoCompleteTextView android:id="@+id/edit_date_start"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="06/12/09"/>
-        
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="End Date:" />
-        
-     <AutoCompleteTextView android:id="@+id/edit_date_end"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="13/12/09"/>        
-            
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Number of People:" />
-        
-     <AutoCompleteTextView android:id="@+id/edit_NumberOfPeople"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="2"/>      
-        
-        
-      <Button android:id="@+id/btnSearch" 
-        android:layout_width="100px" 
-        android:layout_height="40px"
-        android:text="@string/title_search"/>  
-        
-</LinearLayout>
-
-
diff --git a/sandbox/travelsample/scatours-android-ui/res/layout/search.xml b/sandbox/travelsample/scatours-android-ui/res/layout/search.xml
new file mode 100644
index 0000000000..cb7ae6acb6
--- /dev/null
+++ b/sandbox/travelsample/scatours-android-ui/res/layout/search.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:orientation="vertical"
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="From:" />
+
+    <AutoCompleteTextView android:id="@+id/edit_fromLocation"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="LGW"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="To:"/>
+
+    <AutoCompleteTextView android:id="@+id/edit_toLocation"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="FLR"/>
+        
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Start Date:" />
+        
+     <AutoCompleteTextView android:id="@+id/edit_date_start"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="06/12/09"/>
+        
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="End Date:" />
+        
+     <AutoCompleteTextView android:id="@+id/edit_date_end"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="13/12/09"/>        
+            
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Number of People:" />
+        
+     <AutoCompleteTextView android:id="@+id/edit_NumberOfPeople"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="2"/>      
+        
+        
+      <Button android:id="@+id/btnSearch" 
+        android:layout_width="100px" 
+        android:layout_height="40px"
+        android:text="@string/title_search"/>  
+        
+</LinearLayout>
+
+
diff --git a/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml b/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml
new file mode 100644
index 0000000000..fe20d9d7ce
--- /dev/null
+++ b/sandbox/travelsample/scatours-android-ui/res/layout/search_results.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content">
+</LinearLayout>
diff --git a/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java b/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
deleted file mode 100644
index b1191f0077..0000000000
--- a/sandbox/travelsample/scatours-android-ui/src/com/scatours/android/TripSearch.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.scatours.android;
-
-import scatours.SCAToursSearch;
-import scatours.SCAToursSearchProxy;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemSelectedListener;
-
-public class TripSearch extends Activity {
-
-    static final String[] AIRPORT_CODES = new String[] {
-                                                    "LGW - London Gatwick Airport", 
-                                                    "FLR - Luigi Ridolfi Airport",
-                                                    "SFO - San Francisco Airport",
-                                                    "GRU - Sao Paulo Airport",
-                                                    "GIG - Rio de Janeiro Airport"
-                                                    };
-
-    
-    private AutoCompleteTextView txtFromLocation, 
-                                 txtToLocation, 
-                                 txtDateStart, 
-                                 txtDateEnd, 
-                                 txtNumberOfPeople;
-    private Button btnSearch;
-    
-    
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-        
-        
-        ArrayAdapter adapter = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
-        
-        txtFromLocation = (AutoCompleteTextView) findViewById(R.id.edit_fromLocation);
-        //ArrayAdapter adapterFrom = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
-        txtFromLocation.setAdapter(adapter);
-        
-        txtToLocation = (AutoCompleteTextView) findViewById(R.id.edit_toLocation);
-        //ArrayAdapter adapterTo = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
-        txtToLocation.setAdapter(adapter);
-        
-        txtDateStart = (AutoCompleteTextView) findViewById(R.id.edit_date_start);
-        txtDateEnd = (AutoCompleteTextView) findViewById(R.id.edit_date_end);
-        txtNumberOfPeople = (AutoCompleteTextView) findViewById(R.id.edit_NumberOfPeople);
-        
-        btnSearch = (Button) this.findViewById(R.id.btnSearch);
-        
-        doListen();
-    }
-    
-    private void doListen() {
-        
-        txtFromLocation.setOnItemClickListener(new OnItemClickListener() {
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Log.i(getString(R.string.app_name),">>Item Clicked: " +AIRPORT_CODES[position]);
-            }
-            
-        });
-        
-        txtFromLocation.setOnItemSelectedListener(new OnItemSelectedListener() {
-
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                Log.i(getString(R.string.app_name),">>Item Selected: " +AIRPORT_CODES[position]);
-            }
-
-            public void onNothingSelected(AdapterView<?> parent) {
-                Log.i(getString(R.string.app_name),">>Selection cleared");
-            }
-            
-        });
-        
-
-        //closeButton
-        btnSearch.setOnClickListener( new OnClickListener() {
-            public void onClick(View v) {
-                
-                doTripSearch(v);
-                /*
-                //Search trips here
-                new AlertDialog.Builder(TripSearch.this)
-                .setTitle("SCATour")
-                .setMessage("You're about to search for trips !")
-                .setIcon(R.drawable.icon)
-                .setPositiveButton(R.string.alert_yes, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                        
-                    }})
-                    .setNegativeButton(R.string.alert_cancel, new DialogInterface.OnClickListener(){
-                        public void onClick(DialogInterface dialog, int which) {
-                            
-                        }       
-                    })
-                    .show();*/
-            }
-        });
-        
-    }
-    
-    
-    private void doTripSearch(View view) {
-        SCAToursSearch searchProxy = new SCAToursSearchProxy();
-        TripLeg tripLeg = new TripLeg();
-        
-        Log.i(getString(R.string.app_name),"From : " + txtFromLocation.getText().toString() );
-        Log.i(getString(R.string.app_name),"To : " + txtToLocation.getText().toString() );
-        Log.i(getString(R.string.app_name),"Start Date : " + txtDateStart.getText().toString() );
-        Log.i(getString(R.string.app_name),"End Date : " + txtDateEnd.getText().toString() );
-        Log.i(getString(R.string.app_name),"NumberOfPeople : " + txtNumberOfPeople.getText().toString() );
-        
-        tripLeg.setFromLocation("LGW");
-        tripLeg.setToLocation("FLR");
-        tripLeg.setFromDate("06/12/09");
-        tripLeg.setToDate("13/12/09");
-        tripLeg.setNoOfPeople("2");
-        
-        TripItem[] tripsAvailable = searchProxy.search(tripLeg);
-        
-        Log.i(getString(R.string.app_name),"Found " + tripsAvailable.length + " trips");
-    }
-
-}
\ No newline at end of file
diff --git a/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java b/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java
deleted file mode 100644
index 819ab341f3..0000000000
--- a/sandbox/travelsample/scatours-android-ui/src/com/scatours/services/jsonrpc/JSONRpc.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package com.scatours.services.jsonrpc;
-
-import java.io.IOException;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class JSONRpc {
-
-    protected JSONRpc() {
-
-    }
-
-    public static JSONObject invoke(String serviceURI, String rpcRequest) throws JSONException{
-        HttpClient httpClient = new DefaultHttpClient();
-        HttpPost httpPost = new HttpPost(serviceURI);
-
-        JSONObject result = null;
-        try {
-            httpPost.setHeader("Content-Type", "text/xml");
-            httpPost.setEntity(new StringEntity(rpcRequest));
-
-            HttpResponse httpResponse = httpClient.execute(httpPost);
-            if (httpResponse.getStatusLine().getStatusCode() == 200) {
-                String jsonResult = EntityUtils.toString(httpResponse.getEntity());
-                result = new JSONObject(jsonResult);
-            } else {
-                String errorMessage = httpResponse.getStatusLine()
-                .getReasonPhrase();
-                System.out.println(errorMessage);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-}
diff --git a/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java b/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java
index 6bc36651ed..d43d5f7029 100644
--- a/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java
+++ b/sandbox/travelsample/scatours-android-ui/src/scatours/SCAToursSearchProxy.java
@@ -28,11 +28,7 @@ import org.json.JSONObject;
 
 import scatours.common.TripItem;
 import scatours.common.TripLeg;
-
-import android.util.Log;
-
-import com.scatours.android.R;
-import com.scatours.services.jsonrpc.JSONRpc;
+import scatours.jsonrpc.JSONRpc;
 
 public class SCAToursSearchProxy implements SCAToursSearch {
     // see http://developer.android.com/guide/developing/tools/emulator.html
@@ -81,22 +77,4 @@ public class SCAToursSearchProxy implements SCAToursSearch {
         tripCatalog.toArray(catalogArray);
         return catalogArray;
     }
-    
-    public static void main(String[] args) {
-        SCAToursSearch searchProxy = new SCAToursSearchProxy();
-        TripLeg tripLeg = new TripLeg();
-        
-        tripLeg.setFromLocation("LGW");
-        tripLeg.setToLocation("FLR");
-        tripLeg.setFromDate("06/12/09");
-        tripLeg.setToDate("13/12/09");
-        tripLeg.setNoOfPeople("2");
-        
-        TripItem[] tripsAvailable = searchProxy.search(tripLeg);
-        
-        int foundTrips = tripsAvailable.length;
-        System.out.println(foundTrips);
-
-    }
-
 }
diff --git a/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java b/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
new file mode 100644
index 0000000000..e2eb98625b
--- /dev/null
+++ b/sandbox/travelsample/scatours-android-ui/src/scatours/android/TripSearch.java
@@ -0,0 +1,134 @@
+package scatours.android;
+
+import scatours.SCAToursSearch;
+import scatours.SCAToursSearchProxy;
+import scatours.common.TripItem;
+import scatours.common.TripLeg;
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+public class TripSearch extends Activity {
+
+    static final String[] AIRPORT_CODES = new String[] {
+                                                    "LGW - London Gatwick Airport", 
+                                                    "FLR - Luigi Ridolfi Airport",
+                                                    "SFO - San Francisco Airport",
+                                                    "GRU - Sao Paulo Airport",
+                                                    "GIG - Rio de Janeiro Airport"
+                                                    };
+
+    
+    private AutoCompleteTextView txtFromLocation, 
+                                 txtToLocation, 
+                                 txtDateStart, 
+                                 txtDateEnd, 
+                                 txtNumberOfPeople;
+    private Button btnSearch;
+    
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.search);
+        
+        
+        ArrayAdapter adapter = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
+        
+        txtFromLocation = (AutoCompleteTextView) findViewById(R.id.edit_fromLocation);
+        //ArrayAdapter adapterFrom = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
+        txtFromLocation.setAdapter(adapter);
+        
+        txtToLocation = (AutoCompleteTextView) findViewById(R.id.edit_toLocation);
+        //ArrayAdapter adapterTo = new ArrayAdapter(this,android.R.layout.simple_dropdown_item_1line, AIRPORT_CODES);
+        txtToLocation.setAdapter(adapter);
+        
+        txtDateStart = (AutoCompleteTextView) findViewById(R.id.edit_date_start);
+        txtDateEnd = (AutoCompleteTextView) findViewById(R.id.edit_date_end);
+        txtNumberOfPeople = (AutoCompleteTextView) findViewById(R.id.edit_NumberOfPeople);
+        
+        btnSearch = (Button) this.findViewById(R.id.btnSearch);
+        
+        doListen();
+    }
+    
+    private void doListen() {
+        
+        txtFromLocation.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Log.i(getString(R.string.app_name),">>Item Clicked: " +AIRPORT_CODES[position]);
+            }
+            
+        });
+        
+        txtFromLocation.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                Log.i(getString(R.string.app_name),">>Item Selected: " +AIRPORT_CODES[position]);
+            }
+
+            public void onNothingSelected(AdapterView<?> parent) {
+                Log.i(getString(R.string.app_name),">>Selection cleared");
+            }
+            
+        });
+        
+
+        //closeButton
+        btnSearch.setOnClickListener( new OnClickListener() {
+            public void onClick(View v) {
+                
+                doTripSearch(v);
+                /*
+                //Search trips here
+                new AlertDialog.Builder(TripSearch.this)
+                .setTitle("SCATour")
+                .setMessage("You're about to search for trips !")
+                .setIcon(R.drawable.icon)
+                .setPositiveButton(R.string.alert_yes, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int whichButton) {
+                        
+                    }})
+                    .setNegativeButton(R.string.alert_cancel, new DialogInterface.OnClickListener(){
+                        public void onClick(DialogInterface dialog, int which) {
+                            
+                        }       
+                    })
+                    .show();*/
+            }
+        });
+        
+    }
+    
+    
+    private void doTripSearch(View view) {
+        SCAToursSearch searchProxy = new SCAToursSearchProxy();
+        TripLeg tripLeg = new TripLeg();
+        
+        Log.i(getString(R.string.app_name),"From : " + txtFromLocation.getText().toString() );
+        Log.i(getString(R.string.app_name),"To : " + txtToLocation.getText().toString() );
+        Log.i(getString(R.string.app_name),"Start Date : " + txtDateStart.getText().toString() );
+        Log.i(getString(R.string.app_name),"End Date : " + txtDateEnd.getText().toString() );
+        Log.i(getString(R.string.app_name),"NumberOfPeople : " + txtNumberOfPeople.getText().toString() );
+        
+        tripLeg.setFromLocation("LGW");
+        tripLeg.setToLocation("FLR");
+        tripLeg.setFromDate("06/12/09");
+        tripLeg.setToDate("13/12/09");
+        tripLeg.setNoOfPeople("2");
+        
+        TripItem[] tripsAvailable = searchProxy.search(tripLeg);
+        
+        Log.i(getString(R.string.app_name),"Found " + tripsAvailable.length + " trips");
+    }
+
+}
\ No newline at end of file
diff --git a/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java b/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java
new file mode 100644
index 0000000000..c6a9cd8702
--- /dev/null
+++ b/sandbox/travelsample/scatours-android-ui/src/scatours/jsonrpc/JSONRpc.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package scatours.jsonrpc;
+
+import java.io.IOException;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class JSONRpc {
+
+    protected JSONRpc() {
+
+    }
+
+    public static JSONObject invoke(String serviceURI, String rpcRequest) throws JSONException{
+        HttpClient httpClient = new DefaultHttpClient();
+        HttpPost httpPost = new HttpPost(serviceURI);
+
+        JSONObject result = null;
+        try {
+            httpPost.setHeader("Content-Type", "text/xml");
+            httpPost.setEntity(new StringEntity(rpcRequest));
+
+            HttpResponse httpResponse = httpClient.execute(httpPost);
+            if (httpResponse.getStatusLine().getStatusCode() == 200) {
+                String jsonResult = EntityUtils.toString(httpResponse.getEntity());
+                result = new JSONObject(jsonResult);
+            } else {
+                String errorMessage = httpResponse.getStatusLine()
+                .getReasonPhrase();
+                System.out.println(errorMessage);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+}
-- 
cgit v1.2.3