From: kenstir <kenstir@gmail.com>
Date: Tue, 10 Dec 2013 03:40:29 +0000 (-0500)
Subject: checkpoint: 2nd custom app using evergreen app core.  This required customizing the... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ff4492039c1c678969bc127f5b11578e59da3993;p=working%2FEvergreen.git

checkpoint: 2nd custom app using evergreen app core.  This required customizing the accountType used by the AccountManager.
---

diff --git a/Open-ILS/src/Android/core/res/values/ou.xml b/Open-ILS/src/Android/core/res/values/ou.xml
index 9b5b79ff35..1c5438a026 100644
--- a/Open-ILS/src/Android/core/res/values/ou.xml
+++ b/Open-ILS/src/Android/core/res/values/ou.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- ou_cwmars.xml - C/W MARS organizational unit -->
 <resources>
+    <string name="ou_account_type">org.evergreen_ils</string>
     <!--  TODO: make URLs HTTPS -->
     <string name="ou_library_url">http://bark.cwmars.org</string>
     <string name="ou_app_name">C/W Mars Library</string>
diff --git a/Open-ILS/src/Android/core/res/xml/authenticator.xml b/Open-ILS/src/Android/core/res/xml/authenticator.xml
index ff954f3e4a..60ecda54b1 100644
--- a/Open-ILS/src/Android/core/res/xml/authenticator.xml
+++ b/Open-ILS/src/Android/core/res/xml/authenticator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:accountType="org.evergreen_ils"
+                       android:accountType="@string/ou_account_type"
                        android:icon="@drawable/evergreen_launcher_icon"
                        android:smallIcon="@drawable/evergreen_launcher_icon"
                        android:label="@string/ou_account_label"/>
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/AccountAccess.java b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/AccountAccess.java
index f5ab55ac4c..7412fdc95f 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/AccountAccess.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/AccountAccess.java
@@ -32,6 +32,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Looper;
 import android.text.TextUtils;
+import org.evergreen.android.R;
 import org.evergreen.android.accountAccess.bookbags.BookBag;
 import org.evergreen.android.accountAccess.bookbags.BookBagItem;
 import org.evergreen.android.accountAccess.checkout.CircRecord;
@@ -356,8 +357,9 @@ public class AccountAccess {
     public boolean reauthenticate(Activity activity) throws SessionNotFoundException, AuthenticatorException, OperationCanceledException, IOException {
         boolean ok = false;
         final AccountManager am = AccountManager.get(activity);
-        final Account account = new Account(userName, Const.ACCOUNT_TYPE);
-        am.invalidateAuthToken(Const.ACCOUNT_TYPE, authToken);
+        final String accountType = activity.getString(R.string.ou_account_type);
+        final Account account = new Account(userName, accountType);
+        am.invalidateAuthToken(accountType, authToken);
         haveSession = false;
         authToken = null;
         if (runningOnUIThread())
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/LoadingTask.java b/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/LoadingTask.java
index 4c6d506558..5b14dcb8c6 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/LoadingTask.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/LoadingTask.java
@@ -19,6 +19,7 @@
  */
 package org.evergreen.android.views.splashscreen;
 
+import org.evergreen.android.R;
 import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.GlobalConfigs;
@@ -89,7 +90,8 @@ public class LoadingTask {
 
     //TODO: share some of this code with ScheduledIntentService.onHandleIntent
     protected String doInBackground() {
-        final String tag ="doInBackground> "; 
+        final String tag ="doInBackground> ";
+        final String accountType = mCallingActivity.getString(R.string.ou_account_type);
         Log.d(TAG, tag);
         try {
             Log.d(TAG, tag+"Loading resources");
@@ -98,7 +100,8 @@ public class LoadingTask {
 
             Log.d(TAG, tag+"Signing in");
             publishProgress("Signing in");
-            AccountManagerFuture<Bundle> future = mAccountManager.getAuthTokenByFeatures(Const.ACCOUNT_TYPE, Const.AUTHTOKEN_TYPE, null, mCallingActivity, null, null, null, null);
+
+            AccountManagerFuture<Bundle> future = mAccountManager.getAuthTokenByFeatures(accountType, Const.AUTHTOKEN_TYPE, null, mCallingActivity, null, null, null, null);
             Bundle bnd = future.getResult();
             Log.d(TAG, tag+"bnd="+bnd);
             String auth_token = bnd.getString(AccountManager.KEY_AUTHTOKEN);
@@ -117,11 +120,11 @@ public class LoadingTask {
             try {
                 haveSession = ac.retrieveSession(auth_token);
             } catch (SessionNotFoundException e) {
-                mAccountManager.invalidateAuthToken(Const.ACCOUNT_TYPE, auth_token);
+                mAccountManager.invalidateAuthToken(accountType, auth_token);
                 retry = true;
             }
             if (retry) {
-                final Account account = new Account(account_name, Const.ACCOUNT_TYPE);
+                final Account account = new Account(account_name, accountType);
                 future = mAccountManager.getAuthToken(account, Const.AUTHTOKEN_TYPE, null, mCallingActivity, null, null);
                 bnd = future.getResult();
                 Log.d(TAG, tag+"bnd="+bnd);
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/SplashActivity.java b/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/SplashActivity.java
index eb0b18f428..c5de354ebe 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/SplashActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/SplashActivity.java
@@ -87,7 +87,7 @@ public class SplashActivity extends Activity implements LoadingTaskListener {
 
         this.mContext = this;
 
-        // make sure default values are set up for preferences, esp. library_url
+        // make sure default values are set up for preferences
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
         mProgressText = (TextView) findViewById(R.id.action_in_progress);
@@ -101,7 +101,7 @@ public class SplashActivity extends Activity implements LoadingTaskListener {
             }
         });
 
-        GlobalConfigs.httpAddress = PreferenceManager.getDefaultSharedPreferences(this).getString(Const.KEY_LIBRARY_URL, "");
+        GlobalConfigs.httpAddress = getString(R.string.ou_library_url);
         startTask();
     }
     
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
index 051e4f9f5f..e2667b0b23 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
@@ -46,7 +46,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
 
-        // make sure default values are set up for preferences, esp. library_url
+        // make sure default values are set up for preferences
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
         accountManager = AccountManager.get(getBaseContext());
@@ -126,13 +126,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
 
                 String authtoken = null;
                 String errorMessage = "Login failed";
+                final String accountType = AuthenticatorActivity.this.getString(R.string.ou_account_type);
                 Bundle data = new Bundle();
                 try {
                     authtoken = EvergreenAuthenticator.signIn(AuthenticatorActivity.this, username, password);
                     Log.d(TAG, "task> signIn returned "+authtoken);
 
                     data.putString(AccountManager.KEY_ACCOUNT_NAME, username);
-                    data.putString(AccountManager.KEY_ACCOUNT_TYPE, Const.ACCOUNT_TYPE);
+                    data.putString(AccountManager.KEY_ACCOUNT_TYPE, accountType);
                     data.putString(AccountManager.KEY_AUTHTOKEN, authtoken);
                     data.putString(PARAM_USER_PASS, password);
                 } catch (AuthenticationException e) {
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/Const.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/Const.java
index 60a402f733..e6f0aed24d 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/Const.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/Const.java
@@ -1,8 +1,7 @@
 package org.evergreen_ils.auth;
 
 public class Const {
-    public static final String ACCOUNT_TYPE = "org.evergreen_ils";
+    //public static final String ACCOUNT_TYPE = "org.evergreen_ils";
     public static final String AUTHTOKEN_TYPE = "opac";
     public static final String AUTHTOKEN_TYPE_LABEL = "Online Public Access Catalog";
-    public static final String KEY_LIBRARY_URL = "library_url";
 }
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java
index 3f8b9f8ec7..7e5ee9bf3f 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java
@@ -74,7 +74,7 @@ public class EvergreenAuthenticator {
     public static String signIn(Context context, String username, String password) throws AuthenticationException {
         Log.d(TAG, "signIn> "+username);
 
-        final String library_url = PreferenceManager.getDefaultSharedPreferences(context).getString(Const.KEY_LIBRARY_URL,"");
+        final String library_url = context.getString(R.string.ou_library_url);
         HttpConnection conn;
         try {
             conn = new HttpConnection(library_url + "/osrf-gateway-v1");
diff --git a/Open-ILS/src/Android/demo_app/.idea/.name b/Open-ILS/src/Android/demo_app/.idea/.name
new file mode 100644
index 0000000000..06ccfdd670
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/.name
@@ -0,0 +1 @@
+demo_app
\ No newline at end of file
diff --git a/Open-ILS/src/Android/demo_app/.idea/compiler.xml b/Open-ILS/src/Android/demo_app/.idea/compiler.xml
new file mode 100644
index 0000000000..217af471a9
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/compiler.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
+
diff --git a/Open-ILS/src/Android/demo_app/.idea/copyright/profiles_settings.xml b/Open-ILS/src/Android/demo_app/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000000..3572571ad8
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,5 @@
+<component name="CopyrightManager">
+  <settings default="">
+    <module2copyright />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/demo_app/.idea/encodings.xml b/Open-ILS/src/Android/demo_app/.idea/encodings.xml
new file mode 100644
index 0000000000..e206d70d85
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml b/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
new file mode 100644
index 0000000000..26f91dc1c2
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="libs">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../core/libs/org.opensrf2_serialized_reg.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../core/libs/zxing_barcode.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../core/libs/androwrapee-1.1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../core/libs/android-support-v4.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/demo_app/.idea/misc.xml b/Open-ILS/src/Android/demo_app/.idea/misc.xml
new file mode 100644
index 0000000000..4742f8a179
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.4 Platform" project-jdk-type="Android SDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
+
diff --git a/Open-ILS/src/Android/demo_app/.idea/modules.xml b/Open-ILS/src/Android/demo_app/.idea/modules.xml
new file mode 100644
index 0000000000..c98ca80423
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/../core/core.iml" filepath="$PROJECT_DIR$/../core/core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/demo_app.iml" filepath="$PROJECT_DIR$/demo_app.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/Open-ILS/src/Android/demo_app/.idea/scopes/scope_settings.xml b/Open-ILS/src/Android/demo_app/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000000..922003b843
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/demo_app/.idea/uiDesigner.xml b/Open-ILS/src/Android/demo_app/.idea/uiDesigner.xml
new file mode 100644
index 0000000000..3b00020308
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
+
diff --git a/Open-ILS/src/Android/demo_app/.idea/vcs.xml b/Open-ILS/src/Android/demo_app/.idea/vcs.xml
new file mode 100644
index 0000000000..def6a6a184
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+  </component>
+</project>
+
diff --git a/Open-ILS/src/Android/demo_app/AndroidManifest.xml b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
index 534a470eab..e23ed14f08 100644
--- a/Open-ILS/src/Android/demo_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
@@ -6,23 +6,23 @@
           android:versionName="1.0">
 
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+            android:minSdkVersion="8"
+            android:targetSdkVersion="18"/>
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
+    <uses-feature android:name="android.hardware.camera"/>
+    <uses-feature android:name="android.hardware.camera.autofocus"/>
 
     <application
         android:allowBackup="true"
@@ -32,101 +32,101 @@
 
         <!-- Notification receiver -->
         <receiver
-            android:name="org.evergreen.android.services.NotificationReceiver"
-            android:process=":remote" >
+                android:name="org.evergreen.android.services.NotificationReceiver"
+                android:process=":remote">
         </receiver>
         <!-- Receiver to reinit notifications on reboot -->
-        <receiver android:name="org.evergreen.android.services.RebootReceiver" >
+        <receiver android:name="org.evergreen.android.services.RebootReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
-        <receiver android:name="org.evergreen.android.services.PeriodicServiceBroadcastReceiver" >
+        <receiver android:name="org.evergreen.android.services.PeriodicServiceBroadcastReceiver">
             <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
         </receiver>
 
-        <service android:name="org.evergreen.android.services.ScheduledIntentService" >
+        <service android:name="org.evergreen.android.services.ScheduledIntentService">
         </service>
 
         <activity
-            android:name="org.evergreen.android.views.splashscreen.SplashActivity"
-            android:label="@string/ou_app_label">
+                android:name="org.evergreen.android.views.splashscreen.SplashActivity"
+                android:label="@string/ou_app_label">
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-            android:name="org.evergreen.android.views.AccountScreenDashboard"
-            android:theme="@android:style/Theme.Light.NoTitleBar" >
+                android:name="org.evergreen.android.views.AccountScreenDashboard"
+                android:theme="@android:style/Theme.Light.NoTitleBar">
         </activity>
-        <activity android:name="org.evergreen.android.views.ApplicationPreferences" >
+        <activity android:name="org.evergreen.android.views.ApplicationPreferences">
         </activity>
 
         <!-- Search -->
 
         <activity
-            android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade"
-            android:label="Underlines/No Fade" >
+                android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade"
+                android:label="Underlines/No Fade">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation" >
+        <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation">
         </activity>
         <activity
-            android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
-            android:label="@string/ou_app_label" >
+                android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
+                android:label="@string/ou_app_label">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >
+        <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity">
         </activity>
         <activity
-            android:name="org.evergreen.android.barcodescan.CaptureActivity"
-            android:label="@string/ou_app_label"
-            android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:windowSoftInputMode="stateAlwaysHidden" >
+                android:name="org.evergreen.android.barcodescan.CaptureActivity"
+                android:label="@string/ou_app_label"
+                android:screenOrientation="landscape"
+                android:theme="@android:style/Theme.NoTitleBar"
+                android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
 
         <!-- Checkout Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.checkout.ItemsCheckOutListView" >
+        <activity android:name="org.evergreen.android.accountAccess.checkout.ItemsCheckOutListView">
         </activity>
 
         <!-- Holds Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldsListView" >
+        <activity android:name="org.evergreen.android.accountAccess.holds.HoldsListView">
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.PlaceHold" >
+        <activity android:name="org.evergreen.android.accountAccess.holds.PlaceHold">
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldDetails" >
+        <activity android:name="org.evergreen.android.accountAccess.holds.HoldDetails">
         </activity>
 
         <!-- Fines Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.fines.FinesActivity" >
+        <activity android:name="org.evergreen.android.accountAccess.fines.FinesActivity">
         </activity>
 
         <!-- Bookbags -->
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookbagsListView" >
+        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookbagsListView">
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookBagDetails" >
+        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookBagDetails">
         </activity>
 
         <activity
-            android:name="org.evergreen_ils.auth.AuthenticatorActivity"
-            android:label="@string/ou_account_label"
-            android:theme="@android:style/Theme.Light" >
+                android:name="org.evergreen_ils.auth.AuthenticatorActivity"
+                android:label="@string/ou_account_label"
+                android:theme="@android:style/Theme.Light">
         </activity>
 
         <service
-            android:name="org.evergreen_ils.auth.AuthenticatorService"
-            android:exported="false" >
+                android:name="org.evergreen_ils.auth.AuthenticatorService"
+                android:exported="false">
             <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
+                <action android:name="android.accounts.AccountAuthenticator"/>
             </intent-filter>
 
             <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
+                    android:name="android.accounts.AccountAuthenticator"
+                    android:resource="@xml/authenticator"/>
         </service>
     </application>
 </manifest>
diff --git a/Open-ILS/src/Android/demo_app/assets/fm_IDL.xml b/Open-ILS/src/Android/demo_app/assets/fm_IDL.xml
new file mode 100644
index 0000000000..5f8585e813
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/assets/fm_IDL.xml
@@ -0,0 +1,569 @@
+<IDL xmlns='http://opensrf.org/spec/IDL/base/v1' xmlns:idl='http://opensrf.org/spec/IDL/base/v1' xmlns:oils_persist='http://open-ils.org/spec/opensrf/IDL/persistence/v1' xmlns:oils_obj='http://open-ils.org/spec/opensrf/IDL/objects/v1' xmlns:reporter='http://open-ils.org/spec/opensrf/IDL/reporter/v1' xmlns:permacrud='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'><class id='mvr' controller='open-ils.cstore' oils_obj:fieldmapper='metabib::virtual_record' oils_persist:virtual='true' reporter:label='Virtual Record'>
+		<fields>
+			<field name='title' oils_persist:virtual='true'></field>
+			<field name='author' oils_persist:virtual='true'></field>
+			<field name='doc_id' oils_persist:virtual='true'></field>
+			<field name='doc_type' oils_persist:virtual='true'></field>
+			<field name='pubdate' oils_persist:virtual='true'></field>
+			<field name='isbn' oils_persist:virtual='true'></field>
+			<field name='publisher' oils_persist:virtual='true'></field>
+			<field name='tcn' oils_persist:virtual='true'></field>
+			<field name='subject' oils_persist:virtual='true'></field>
+			<field name='types_of_resource' oils_persist:virtual='true'></field>
+			<field name='call_numbers' oils_persist:virtual='true'></field>
+			<field name='edition' oils_persist:virtual='true'></field>
+			<field name='online_loc' oils_persist:virtual='true'></field>
+			<field name='synopsis' oils_persist:virtual='true'></field>
+			<field name='physical_description' oils_persist:virtual='true'></field>
+			<field name='toc' oils_persist:virtual='true'></field>
+			<field name='copy_count' oils_persist:virtual='true'></field>
+			<field name='series' oils_persist:virtual='true'></field>
+			<field name='serials' oils_persist:virtual='true'></field>
+			<field name='foreign_copy_maps' oils_persist:virtual='true'></field>
+		</fields>
+	</class><class id='ex' controller='open-ils.cstore' oils_obj:fieldmapper='ex' oils_persist:virtual='true'>
+		<fields>
+			<field name='err_msg' oils_persist:virtual='true'></field>
+			<field name='type' oils_persist:virtual='true'></field>
+		</fields>
+	</class><class id='perm_ex' controller='open-ils.cstore' oils_obj:fieldmapper='perm_ex' oils_persist:virtual='true'>
+		<fields>
+			<field name='err_msg' oils_persist:virtual='true'></field>
+			<field name='type' oils_persist:virtual='true'></field>
+		</fields>
+	</class><class id='mbts' controller='open-ils.cstore' oils_obj:fieldmapper='money::billable_transaction_summary' oils_persist:tablename='money.materialized_billable_xact_summary' reporter:label='Billable Transaction Summary' oils_persist:readonly='true'>
+		<fields oils_persist:primary='id' oils_persist:sequence=''>
+			<field reporter:label='Balance Owed' name='balance_owed' reporter:datatype='money'></field>
+			<field reporter:label='Transaction ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='Last Billing Note' name='last_billing_note' reporter:datatype='text'></field>
+			<field reporter:label='Last Billing Timestamp' name='last_billing_ts' reporter:datatype='timestamp'></field>
+			<field reporter:label='Last Billing Type' name='last_billing_type' reporter:datatype='text'></field>
+			<field reporter:label='Last Payment Note' name='last_payment_note' reporter:datatype='text'></field>
+			<field reporter:label='Last Payment Timestamp' name='last_payment_ts' reporter:datatype='timestamp'></field>
+			<field reporter:label='Last Payment Type' name='last_payment_type' reporter:datatype='text'></field>
+			<field reporter:label='Total Owed' name='total_owed' reporter:datatype='money'></field>
+			<field reporter:label='Total Paid' name='total_paid' reporter:datatype='money'></field>
+			<field reporter:label='Billed User' name='usr' reporter:datatype='link'></field>
+			<field reporter:label='Transaction Finish Time' name='xact_finish' reporter:datatype='timestamp'></field>
+			<field reporter:label='Transaction Start Time' name='xact_start' reporter:datatype='timestamp'></field>
+			<field reporter:label='Transaction Type' name='xact_type' reporter:datatype='text'></field>
+		</fields>
+		<links>
+			<link field='usr' reltype='has_a' key='id' map='' class='au'></link>
+		</links>
+	</class><class id='acn' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='asset::call_number' oils_persist:tablename='asset.call_number' reporter:label='Call Number/Volume'>
+		<fields oils_persist:primary='id' oils_persist:sequence='asset.call_number_id_seq'>
+			<field reporter:label='Copies' name='copies' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Create Date/Time' name='create_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Creating User' name='creator' reporter:datatype='link'></field>
+			<field reporter:label='Is Deleted' name='deleted' reporter:datatype='bool'></field>
+			<field reporter:label='Last Edit Date/Time' name='edit_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Last Editing User' name='editor' reporter:datatype='link'></field>
+			<field reporter:label='Call Number/Volume ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='Call Number Label' name='label' reporter:datatype='text'></field>
+			<field reporter:label='Owning Library' name='owning_lib' reporter:datatype='org_unit'></field>
+			<field reporter:label='Bib Record' name='record' reporter:datatype='link'></field>
+			<field reporter:label='Notes' name='notes' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='URI Maps' name='uri_maps' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='URIs' name='uris' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Call Number Sort Key' name='label_sortkey' reporter:datatype='text'></field>
+			<field reporter:label='Classification Scheme' name='label_class' reporter:datatype='link'></field>
+			<field reporter:label='Prefix' name='prefix' reporter:datatype='link'></field>
+			<field reporter:label='Suffix' name='suffix' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='editor' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='creator' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='record' reltype='has_a' key='id' map='' class='bre'></link>
+			<link field='owning_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='notes' reltype='has_many' key='call_number' map='' class='acnn'></link>
+			<link field='copies' reltype='has_many' key='call_number' map='' class='acp'></link>
+			<link field='uris' reltype='has_many' key='call_number' map='uri' class='auricnm'></link>
+			<link field='uri_maps' reltype='has_many' key='call_number' map='' class='auricnm'></link>
+			<link field='label_class' reltype='has_a' key='id' map='' class='acnc'></link>
+			<link field='prefix' reltype='has_a' key='id' map='' class='acnp'></link>
+			<link field='suffix' reltype='has_a' key='id' map='' class='acns'></link>
+		</links>
+        <permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+            <actions>
+                <create permission='CREATE_VOLUME' context_field='owning_lib'></create>
+                <retrieve></retrieve>
+                <update permission='UPDATE_VOLUME' context_field='owning_lib'></update>
+                <delete permission='DELETE_VOLUME' context_field='owning_lib'></delete>
+            </actions>
+        </permacrud>
+	</class><class id='mous' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='money::open_user_summary' oils_persist:tablename='money.open_usr_summary' reporter:label='Open User Summary'>
+		<fields oils_persist:primary='usr' oils_persist:sequence=''>
+			<field name='balance_owed' reporter:datatype='money'></field>
+			<field name='total_owed' reporter:datatype='money'></field>
+			<field name='total_paid' reporter:datatype='money'></field>
+			<field name='usr' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='usr' reltype='has_a' key='id' map='' class='au'></link>
+        </links>
+        <permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+            <actions>
+                <retrieve permission='VIEW_USER'>
+                    <context link='usr' field='home_ou'></context>
+                </retrieve>
+            </actions>
+        </permacrud>
+	</class><class id='au' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='actor::user' oils_persist:tablename='actor.usr' reporter:core='true' reporter:label='ILS User'>
+		<fields oils_persist:primary='id' oils_persist:sequence='actor.usr_id_seq'>
+			<field reporter:label='All Addresses' name='addresses' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='All Library Cards' name='cards' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='All Circulations' name='checkouts' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='All Hold Requests' name='hold_requests' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='All Permissions' name='permissions' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='All User Settings' name='settings' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Standing Penalties' name='standing_penalties' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Statistical Category Entries' name='stat_cat_entries' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Survey Responses' name='survey_responses' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Workstation Org Unit' name='ws_ou' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Workstation ID' name='wsid' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Active' name='active' reporter:datatype='bool'></field>
+			<field reporter:label='Alert Message' name='alert_message' reporter:datatype='text'></field>
+			<field reporter:label='Barred' name='barred' reporter:datatype='bool'></field>
+			<field reporter:label='Physical Address' name='billing_address' reporter:datatype='link'></field>
+			<field reporter:label='Current Library Card' name='card' reporter:datatype='link'></field>
+			<field reporter:label='Claims-returned Count' name='claims_returned_count' reporter:datatype='int'></field>
+			<field reporter:label='Claims Never Checked Out Count' name='claims_never_checked_out_count' reporter:datatype='int'></field>
+			<field reporter:label='Record Creation Date/Time' name='create_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='User Credit Balance' name='credit_forward_balance' reporter:datatype='money'></field>
+			<field reporter:label='Daytime Phone' name='day_phone' reporter:datatype='text'></field>
+			<field reporter:label='Date of Birth' name='dob' reporter:datatype='timestamp'></field>
+			<field reporter:label='Email Address' name='email' reporter:datatype='text'></field>
+			<field reporter:label='Evening Phone' name='evening_phone' reporter:datatype='text'></field>
+			<field reporter:label='Privilege Expiration Date' name='expire_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Last Name' name='family_name' reporter:datatype='text'></field>
+			<field reporter:label='First Name' name='first_given_name' reporter:datatype='text'></field>
+			<field reporter:label='Home Library' name='home_ou' reporter:datatype='org_unit'></field>
+			<field reporter:label='User ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='Primary Identification Type' name='ident_type' reporter:datatype='link'></field>
+			<field reporter:label='Secondary Identification Type' name='ident_type2' reporter:datatype='link'></field>
+			<field reporter:label='Primary Identification' name='ident_value' reporter:datatype='text'></field>
+			<field reporter:label='Secondary Identification' name='ident_value2' reporter:datatype='text'></field>
+			<field reporter:label='Last Transaction ID' name='last_xact_id' reporter:datatype='text'></field>
+			<field reporter:label='Mailing Address' name='mailing_address' reporter:datatype='link'></field>
+			<field reporter:label='Is Group Lead Account' name='master_account' reporter:datatype='bool'></field>
+			<field reporter:label='Internet Access Level' name='net_access_level' reporter:datatype='link'></field>
+			<field reporter:label='Other Phone' name='other_phone' reporter:datatype='text'></field>
+			<field reporter:label='Password' name='passwd' suppress_controller='open-ils.pcrud open-ils.reporter-store' reporter:datatype='text'></field>
+			<field reporter:label='Photo URL' name='photo_url' reporter:datatype='text'></field>
+			<field reporter:label='Prefix/Title' name='prefix' reporter:datatype='text'></field>
+			<field reporter:label='Main (Profile) Permission Group' name='profile' reporter:datatype='link'></field>
+			<field reporter:label='Middle Name' name='second_given_name' reporter:datatype='text'></field>
+			<field reporter:label='Standing (unused)' name='standing' reporter:datatype='link'></field>
+			<field reporter:label='Suffix' name='suffix' reporter:datatype='text'></field>
+			<field reporter:label='Is Super User' name='super_user' reporter:datatype='bool'></field>
+			<field reporter:label='Family Linkage or other Group' name='usrgroup' reporter:datatype='int'></field>
+			<field reporter:label='OPAC/Staff Client User Name' name='usrname' reporter:datatype='text'></field>
+			<field reporter:label='OPAC/Staff Client Holds Alias' name='alias' reporter:datatype='text'></field>
+			<field reporter:label='Juvenile' name='juvenile' reporter:datatype='bool'></field>
+			<field reporter:label='Record Last Update Time' name='last_update_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Additional Permission Groups' name='groups' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Is Deleted' name='deleted' reporter:datatype='bool'></field>
+			<field reporter:label='User Notes' name='notes' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Demographic Info' name='demographic' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Billable Transactions' name='billable_transactions' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Money Summary' name='money_summary' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Open Billable Transactions' name='open_billable_transactions_summary' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Checkins' name='checkins' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Circulations Performed as Staff' name='performed_circulations' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Fund Allocation Percentages' name='fund_alloc_pcts' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Reservations' name='reservations' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='User Activity Entries' name='usr_activity' oils_persist:virtual='true' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='demographic' reltype='might_have' key='id' map='' class='rud'></link>
+			<link field='net_access_level' reltype='has_a' key='id' map='' class='cnal'></link>
+			<link field='profile' reltype='has_a' key='id' map='' class='pgt'></link>
+			<link field='ident_type' reltype='has_a' key='id' map='' class='cit'></link>
+			<link field='billing_address' reltype='has_a' key='id' map='' class='aua'></link>
+			<link field='mailing_address' reltype='has_a' key='id' map='' class='aua'></link>
+			<link field='home_ou' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='standing' reltype='has_a' key='id' map='' class='cst'></link>
+			<link field='card' reltype='has_a' key='id' map='' class='ac'></link>
+			<link field='ident_type2' reltype='has_a' key='id' map='' class='cit'></link>
+			<link field='stat_cat_entries' reltype='has_many' key='target_usr' map='' class='actscecm'></link>
+			<link field='groups' reltype='has_many' key='usr' map='grp' class='pugm'></link>
+			<link field='usrgroup' reltype='has_many' key='usrgroup' map='' class='au'></link>
+			<link field='checkouts' reltype='has_many' key='usr' map='' class='circ'></link>
+			<link field='hold_requests' reltype='has_many' key='usr' map='' class='ahr'></link>
+			<link field='permissions' reltype='has_many' key='usr' map='perm' class='pupm'></link>
+			<link field='settings' reltype='has_many' key='usr' map='' class='aus'></link>
+			<link field='billable_transactions' reltype='has_many' key='usr' map='' class='mbt'></link>
+			<link field='open_billable_transactions_summary' reltype='has_many' key='usr' map='' class='mobts'></link>
+			<link field='money_summary' reltype='might_have' key='usr' map='' class='mus'></link>
+			<link field='standing_penalties' reltype='has_many' key='usr' map='' class='ausp'></link>
+			<link field='addresses' reltype='has_many' key='usr' map='' class='aua'></link>
+			<link field='survey_responses' reltype='has_many' key='usr' map='' class='asvr'></link>
+			<link field='notes' reltype='has_many' key='usr' map='' class='aun'></link>
+			<link field='checkins' reltype='has_many' key='checkin_staff' map='' class='circ'></link>
+			<link field='cards' reltype='has_many' key='usr' map='' class='ac'></link>
+			<link field='performed_circulations' reltype='has_many' key='circ_staff' map='' class='circ'></link>
+			<link field='fund_alloc_pcts' reltype='has_many' key='allocator' map='' class='acqfap'></link>
+			<link field='reservations' reltype='has_many' key='usr' map='' class='bresv'></link>
+			<link field='usr_activity' reltype='has_many' key='usr' map='' class='auact'></link>
+		</links>
+		<permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+			<actions>
+				<retrieve permission='VIEW_USER' context_field='home_ou'></retrieve>
+			</actions>
+		</permacrud>
+	</class><class id='ccs' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='config::copy_status' oils_persist:tablename='config.copy_status' oils_persist:restrict_primary='100' reporter:label='Copy Status' oils_persist:field_safe='true'>
+		<fields oils_persist:primary='id' oils_persist:sequence='config.copy_status_id_seq'>
+			<field name='holdable' reporter:datatype='bool'></field>
+			<field name='id' reporter:selector='name' reporter:datatype='id'></field>
+			<field name='name' reporter:datatype='text' oils_persist:i18n='true'></field>
+			<field name='opac_visible' reporter:datatype='bool'></field>
+            <field name='copy_active' reporter:datatype='bool'></field>
+	    <field name='restrict_copy_delete' reporter:datatype='bool'></field>
+		</fields>
+		<links></links>
+        <permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+            <actions>
+                <create permission='CREATE_COPY_STATUS' global_required='true'></create>
+                <retrieve></retrieve>
+                <update permission='UPDATE_COPY_STATUS' global_required='true'></update>
+                <delete permission='DELETE_COPY_STATUS' global_required='true'></delete>
+            </actions>
+        </permacrud>
+	</class><class id='circ' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='action::circulation' oils_persist:tablename='action.circulation' reporter:core='false' reporter:label='Circulation'>
+		<fields oils_persist:primary='id' oils_persist:sequence='money.billable_xact_id_seq'>
+			<field reporter:label='Check In Library' name='checkin_lib' reporter:datatype='org_unit'></field>
+			<field reporter:label='Check In Staff' name='checkin_staff' reporter:datatype='link'></field>
+			<field reporter:label='Check In Date/Time' name='checkin_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Circulating Library' name='circ_lib' reporter:datatype='org_unit'></field>
+			<field reporter:label='Circulating Staff' name='circ_staff' reporter:datatype='link'></field>
+			<field reporter:label='Desk Renewal' name='desk_renewal' reporter:datatype='bool'></field>
+			<field reporter:label='Due Date/Time' name='due_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Circulation Duration' name='duration' reporter:datatype='interval'></field>
+			<field reporter:label='Circ Duration Rule' name='duration_rule' reporter:datatype='link'></field>
+			<field reporter:label='Fine Interval' name='fine_interval' reporter:datatype='interval'></field>
+			<field reporter:label='Circ ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='Max Fine Amount' name='max_fine' reporter:datatype='money'></field>
+			<field reporter:label='Max Fine Rule' name='max_fine_rule' reporter:datatype='link'></field>
+			<field reporter:label='OPAC Renewal' name='opac_renewal' reporter:datatype='bool'></field>
+			<field reporter:label='Phone Renewal' name='phone_renewal' reporter:datatype='bool'></field>
+			<field reporter:label='Recurring Fine Amount' name='recurring_fine' reporter:datatype='money'></field>
+			<field reporter:label='Recurring Fine Rule' name='recurring_fine_rule' reporter:datatype='link'></field>
+			<field reporter:label='Remaining Renewals' name='renewal_remaining' reporter:datatype='int'></field>
+			<field reporter:label='Grace Period' name='grace_period' reporter:datatype='interval'></field>
+			<field reporter:label='Fine Stop Reason' name='stop_fines' reporter:datatype='text'></field>
+			<field reporter:label='Fine Stop Date/Time' name='stop_fines_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Circulating Item' name='target_copy' reporter:datatype='link'></field>
+			<field reporter:label='Patron' name='usr' reporter:datatype='link'></field>
+			<field reporter:label='Transaction Finish Date/Time' name='xact_finish' reporter:datatype='timestamp'></field>
+			<field reporter:label='Check Out Date/Time' name='xact_start' reporter:datatype='timestamp'></field>
+			<field reporter:label='Record Creation Date/Time' name='create_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Workstation' name='workstation' reporter:datatype='link'></field>
+			<field reporter:label='Checkin Workstation' name='checkin_workstation' reporter:datatype='link'></field>
+			<field reporter:label='Checkin Scan Date/Time' name='checkin_scan_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Parent Circulation' name='parent_circ' reporter:datatype='link'></field>
+			<field reporter:label='Transaction Billings' name='billings' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Transaction Payments' name='payments' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Base Transaction' name='billable_transaction' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Circulation Type' name='circ_type' oils_persist:virtual='true' reporter:datatype='text'></field>
+			<field reporter:label='Billing Totals' name='billing_total' oils_persist:virtual='true' reporter:datatype='money'></field>
+			<field reporter:label='Payment Totals' name='payment_total' oils_persist:virtual='true' reporter:datatype='money'></field>
+			<field reporter:label='Unrecovered Debt' name='unrecovered' reporter:datatype='bool'></field>
+			<field reporter:label='Shelving Location' name='copy_location' reporter:datatype='link'></field>
+			<field reporter:label='Archived Patron Stat-Cat Entries' name='aaactsc_entries' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Archived Copy Stat-Cat Entries' name='aaasc_entries' oils_persist:virtual='true' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='billable_transaction' reltype='might_have' key='id' map='' class='mbt'></link>
+			<link field='circ_staff' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='checkin_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='target_copy' reltype='has_a' key='id' map='' class='acp'></link>
+			<link field='checkin_staff' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='usr' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='circ_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='payments' reltype='has_many' key='xact' map='' class='mp'></link>
+			<link field='billings' reltype='has_many' key='xact' map='' class='mb'></link>
+			<link field='duration_rule' reltype='has_a' key='name' map='' class='crcd'></link>
+			<link field='max_fine_rule' reltype='has_a' key='name' map='' class='crmf'></link>
+			<link field='recurring_fine_rule' reltype='has_a' key='name' map='' class='crrf'></link>
+			<link field='circ_type' reltype='might_have' key='id' map='' class='rcirct'></link>
+			<link field='billing_total' reltype='might_have' key='xact' map='' class='rxbt'></link>
+			<link field='payment_total' reltype='might_have' key='xact' map='' class='rxpt'></link>
+			<link field='workstation' reltype='has_a' key='id' map='' class='aws'></link>
+			<link field='checkin_workstation' reltype='has_a' key='id' map='' class='aws'></link>
+			<link field='parent_circ' reltype='has_a' key='id' map='' class='circ'></link>
+			<link field='renewals' reltype='has_many' key='parent_circ' map='' class='circ'></link>
+			<link field='copy_location' reltype='has_a' key='id' map='' class='acpl'></link>
+			<link field='aaactsc_entries' reltype='has_many' key='xact' map='' class='aaactsc'></link>
+			<link field='aaasc_entries' reltype='has_many' key='xact' map='' class='aaasc'></link>
+		</links>
+		<permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+			<actions>
+				<retrieve permission='VIEW_CIRCULATIONS' context_field='circ_lib'></retrieve>
+			</actions>
+		</permacrud>
+	</class><class id='cbreb' controller='open-ils.cstore' oils_obj:fieldmapper='container::biblio_record_entry_bucket' oils_persist:tablename='container.biblio_record_entry_bucket' reporter:label='Bibliographic Record Entry Bucket'>
+		<fields oils_persist:primary='id' oils_persist:sequence='container.biblio_record_entry_bucket_id_seq'>
+			<field name='items' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field name='btype' reporter:datatype='text'></field>
+			<field name='id' reporter:datatype='id'></field>
+			<field name='name' reporter:datatype='text'></field>
+			<field name='description' reporter:datatype='text'></field>
+			<field name='owner' reporter:datatype='link'></field>
+			<field name='pub' reporter:datatype='bool'></field>
+			<field name='create_time' reporter:datatype='timestamp'></field>
+		</fields>
+		<links>
+			<link field='owner' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='items' reltype='has_many' key='bucket' map='' class='cbrebi'></link>
+		</links>
+	</class><class id='cbrebn' controller='open-ils.cstore' oils_obj:fieldmapper='container::biblio_record_entry_bucket_note' oils_persist:tablename='container.biblio_record_entry_bucket_note' reporter:label='Bibliographic Record Entry Bucket Note'>
+		<fields oils_persist:primary='id' oils_persist:sequence='container.biblio_record_entry_bucket_note_id_seq'>
+			<field name='id' reporter:datatype='id'></field>
+			<field name='bucket' reporter:datatype='link'></field>
+			<field name='note' reporter:datatype='text'></field>
+		</fields>
+		<links>
+			<link field='bucket' reltype='has_a' key='id' map='' class='cbreb'></link>
+		</links>
+	</class><class id='ahr' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='action::hold_request' oils_persist:tablename='action.hold_request' reporter:core='true' reporter:label='Hold Request'>
+		<fields oils_persist:primary='id' oils_persist:sequence='action.hold_request_id_seq'>
+			<field reporter:label='Status' name='status' oils_persist:virtual='true'></field>
+			<field reporter:label='Transit' name='transit' oils_persist:virtual='true'></field>
+			<field reporter:label='Capture Date/Time' name='capture_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Currently Targeted Copy' name='current_copy'></field>
+			<field reporter:label='Notify by Email?' name='email_notify' reporter:datatype='bool'></field>
+			<field reporter:label='Hold Expire Date/Time' name='expire_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Fulfilling Library' name='fulfillment_lib' reporter:datatype='org_unit'></field>
+			<field reporter:label='Fulfilling Staff' name='fulfillment_staff'></field>
+			<field reporter:label='Fulfillment Date/Time' name='fulfillment_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Hold Type' name='hold_type' reporter:datatype='text'></field>
+			<field reporter:label='Holdable Formats (for M-type hold)' name='holdable_formats' reporter:datatype='text'></field>
+			<field reporter:label='Hold ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='Notifications Phone Number' name='phone_notify' reporter:datatype='text'></field>
+			<field reporter:label='Notifications SMS Number' name='sms_notify' reporter:datatype='text'></field>
+			<field reporter:label='Notifications SMS Carrier' name='sms_carrier' reporter:datatype='link'></field>
+			<field reporter:label='Pickup Library' name='pickup_lib' reporter:datatype='org_unit'></field>
+			<field reporter:label='Last Targeting Date/Time' name='prev_check_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Requesting Library' name='request_lib' reporter:datatype='org_unit'></field>
+			<field reporter:label='Request Date/Time' name='request_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Requesting User' name='requestor' reporter:datatype='link'></field>
+			<field reporter:label='Item Selection Depth' name='selection_depth'></field>
+			<field reporter:label='Selection Locus' name='selection_ou' reporter:datatype='org_unit'></field>
+			<field reporter:label='Target Object ID' name='target' reporter:datatype='link'></field>
+			<field reporter:label='Hold User' name='usr' reporter:datatype='link'></field>
+			<field reporter:label='Hold Cancel Date/Time' name='cancel_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Notify Time' name='notify_time' oils_persist:virtual='true' reporter:datatype='timestamp'></field>
+			<field reporter:label='Notify Count' name='notify_count' oils_persist:virtual='true' reporter:datatype='int'></field>
+			<field reporter:label='Notifications' name='notifications' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Bib Record link' name='bib_rec' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Eligible Copies' name='eligible_copies' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Currently Frozen' name='frozen' reporter:datatype='bool'></field>
+			<field reporter:label='Thaw Date (if frozen)' name='thaw_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Shelf Time' name='shelf_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Cancelation cause' name='cancel_cause' reporter:datatype='link'></field>
+			<field reporter:label='Cancelation note' name='cancel_note' reporter:datatype='text'></field>
+			<field reporter:label='Top of Queue' name='cut_in_line' reporter:datatype='bool'></field>
+			<field reporter:label='Is Mint Condition' name='mint_condition' reporter:datatype='bool'></field>
+			<field reporter:label='Shelf Expire Time' name='shelf_expire_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Notes' name='notes' reporter:datatype='link' oils_persist:virtual='true'></field>
+			<field reporter:label='Current Shelf Lib' name='current_shelf_lib' reporter:datatype='org_unit'></field>
+		</fields>
+		<links>
+			<link field='fulfillment_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='fulfillment_staff' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='pickup_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='selection_ou' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='requestor' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='current_copy' reltype='has_a' key='id' map='' class='acp'></link>
+			<link field='usr' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='request_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='transit' reltype='might_have' key='hold' map='' class='ahtc'></link>
+			<link field='notifications' reltype='has_many' key='hold' map='' class='ahn'></link>
+			<link field='eligible_copies' reltype='has_many' key='hold' map='target_copy' class='ahcm'></link>
+			<link field='bib_rec' reltype='might_have' key='id' map='' class='rhrr'></link>
+			<link field='cancel_cause' reltype='might_have' key='id' map='' class='ahrcc'></link>
+			<link field='notes' reltype='has_many' key='hold' map='' class='ahrn'></link>
+			<link field='current_shelf_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='sms_carrier' reltype='has_a' key='id' map='' class='csc'></link>
+		</links>
+		<permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+			<actions>
+				<retrieve permission='VIEW_HOLD' context_field='pickup_lib'></retrieve>
+			</actions>
+		</permacrud>
+	</class><class id='mbt' controller='open-ils.cstore' oils_obj:fieldmapper='money::billable_transaction' oils_persist:tablename='money.billable_xact' reporter:label='Billable Transaction'>
+		<fields oils_persist:primary='id' oils_persist:sequence='money.billable_xact_id_seq'>
+			<field reporter:label='Transaction ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='User' name='usr' reporter:datatype='link'></field>
+			<field reporter:label='Transaction Finish Date/Time' name='xact_finish' reporter:datatype='timestamp'></field>
+			<field reporter:label='Transaction Start Date/Time' name='xact_start' reporter:datatype='timestamp'></field>
+			<field reporter:label='Unrecovered Debt' name='unrecovered' reporter:datatype='bool'></field>
+			<field reporter:label='Grocery Billing link' name='grocery' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Circulation Billing link' name='circulation' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Billing Line Items' name='billings' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Payment Line Items' name='payments' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Billing Totals' name='billing_total' oils_persist:virtual='true' reporter:datatype='money'></field>
+			<field reporter:label='Payment Totals' name='payment_total' oils_persist:virtual='true' reporter:datatype='money'></field>
+			<field reporter:label='Payment Summary' name='summary' oils_persist:virtual='true' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='grocery' reltype='might_have' key='id' map='' class='mg'></link>
+			<link field='circulation' reltype='might_have' key='id' map='' class='circ'></link>
+			<link field='usr' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='payments' reltype='has_many' key='xact' map='' class='mp'></link>
+			<link field='billings' reltype='has_many' key='xact' map='' class='mb'></link>
+			<link field='billing_total' reltype='might_have' key='xact' map='' class='rxbt'></link>
+			<link field='payment_total' reltype='might_have' key='xact' map='' class='rxpt'></link>
+			<link field='summary' reltype='might_have' key='id' map='' class='mbts'></link>
+		</links>
+	</class><class id='mus' controller='open-ils.cstore' oils_obj:fieldmapper='money::user_summary' oils_persist:tablename='money.usr_summary' reporter:label='User Summary'>
+		<fields oils_persist:primary='usr' oils_persist:sequence=''>
+			<field name='balance_owed' reporter:datatype='money'></field>
+			<field name='total_owed' reporter:datatype='money'></field>
+			<field name='total_paid' reporter:datatype='money'></field>
+			<field name='usr' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='usr' reltype='has_a' key='id' map='' class='au'></link>
+		</links>
+	</class><class id='acp' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='asset::copy' oils_persist:tablename='asset.copy' reporter:core='true' reporter:label='Item'>
+		<fields oils_persist:primary='id' oils_persist:sequence='asset.copy_id_seq'>
+			<field reporter:label='Age Hold Protection' name='age_protect' reporter:datatype='link'></field>
+			<field reporter:label='Alert Message' name='alert_message' reporter:datatype='text'></field>
+			<field reporter:label='Barcode' name='barcode' reporter:datatype='text'></field>
+			<field reporter:label='Call Number/Volume' name='call_number' reporter:datatype='link'></field>
+			<field reporter:label='Circulation Type (MARC)' name='circ_as_type' reporter:datatype='text'></field>
+			<field reporter:label='Circulating Library' name='circ_lib' reporter:datatype='org_unit'></field>
+			<field reporter:label='Circulation Modifier' name='circ_modifier' reporter:datatype='link'></field>
+			<field reporter:label='Can Circulate' name='circulate' reporter:datatype='bool'></field>
+			<field reporter:label='Copy Number on Volume' name='copy_number' reporter:datatype='text'></field>
+			<field reporter:label='Creation Date/Time' name='create_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Active Date/Time' name='active_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Creating User' name='creator' reporter:datatype='link'></field>
+			<field reporter:label='Is Deleted' name='deleted' reporter:datatype='bool'></field>
+			<field reporter:label='Dummy ISBN' name='dummy_isbn' reporter:datatype='text'></field>
+			<field reporter:label='Is Deposit Required' name='deposit' reporter:datatype='bool'></field>
+			<field reporter:label='Deposit Amount' name='deposit_amount' reporter:datatype='money'></field>
+			<field reporter:label='Precat Dummy Author' name='dummy_author' reporter:datatype='text'></field>
+			<field reporter:label='Precat Dummy Title' name='dummy_title' reporter:datatype='text'></field>
+			<field reporter:label='Last Edit Date/Time' name='edit_date' reporter:datatype='timestamp'></field>
+			<field reporter:label='Last Editing User' name='editor' reporter:datatype='link'></field>
+			<field reporter:label='Fine Level' name='fine_level' reporter:datatype='int'></field>
+			<field reporter:label='Is Holdable' name='holdable' reporter:datatype='bool'></field>
+			<field reporter:label='Copy ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='Loan Duration' name='loan_duration' reporter:datatype='int'></field>
+			<field reporter:label='Shelving Location' name='location' reporter:datatype='link'></field>
+			<field reporter:label='OPAC Visible' name='opac_visible' reporter:datatype='bool'></field>
+			<field reporter:label='Price' name='price' reporter:datatype='money'></field>
+			<field reporter:label='Is Reference' name='ref' reporter:datatype='bool'></field>
+			<field reporter:label='Copy Status' name='status' reporter:datatype='link'></field>
+			<field reporter:label='Copy Status Changed Time' name='status_changed_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Is Mint Condition' name='mint_condition' reporter:datatype='bool'></field>
+			<field reporter:label='Is Floating' name='floating' reporter:datatype='bool'></field>
+			<field reporter:label='Cost' name='cost' reporter:datatype='money'></field>
+			<field reporter:label='Copy Notes' name='notes' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Stat-Cat entry maps' name='stat_cat_entry_copy_maps' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Circulations' name='circulations' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Total Circulations' name='total_circ_count' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Last Circulation Date' name='last_circ' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Holds' name='holds' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Statistical Category Entries' name='stat_cat_entries' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Monograph Parts' name='parts' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Peer Record Maps' name='peer_record_maps' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Peer Records' name='peer_records' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Last Captured Hold' name='last_captured_hold' oils_persist:virtual='true' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='age_protect' reltype='has_a' key='id' map='' class='crahp'></link>
+			<link field='call_number' reltype='has_a' key='id' map='' class='acn'></link>
+			<link field='location' reltype='has_a' key='id' map='' class='acpl'></link>
+			<link field='editor' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='creator' reltype='has_a' key='id' map='' class='au'></link>
+			<link field='status' reltype='has_a' key='id' map='' class='ccs'></link>
+			<link field='circ_lib' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='holds' reltype='has_many' key='target_copy' map='hold' class='ahcm'></link>
+			<link field='stat_cat_entry_copy_maps' reltype='has_many' key='owning_copy' map='' class='ascecm'></link>
+			<link field='notes' reltype='has_many' key='owning_copy' map='' class='acpn'></link>
+			<link field='stat_cat_entries' reltype='has_many' key='owning_copy' map='stat_cat_entry' class='ascecm'></link>
+			<link field='circulations' reltype='has_many' key='target_copy' map='' class='circ'></link>
+			<link field='total_circ_count' reltype='might_have' key='id' map='' class='erfcc'></link>
+			<link field='last_circ' reltype='might_have' key='id' map='' class='rlc'></link>
+			<link field='circ_modifier' reltype='has_a' key='code' map='' class='ccm'></link>
+			<link field='parts' reltype='has_many' key='target_copy' map='part' class='acpm'></link>
+			<link field='peer_record_maps' reltype='has_many' key='target_copy' map='' class='bpbcm'></link>
+			<link field='peer_records' reltype='has_many' key='target_copy' map='peer_record' class='bpbcm'></link>
+			<link field='last_captured_hold' reltype='has_a' key='current_copy' map='' class='alhr'></link>
+		</links>
+        <permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+            <actions>
+                <create permission='CREATE_COPY'>
+                    <context link='call_number' field='owning_lib'></context>
+                </create>
+                <retrieve></retrieve>
+                <update permission='UPDATE_COPY'>
+                    <context link='call_number' field='owning_lib'></context>
+                </update>
+                <delete permission='DELETE_COPY'>
+                    <context link='call_number' field='owning_lib'></context>
+                </delete>
+            </actions>
+        </permacrud>
+	</class><class id='cbrebi' controller='open-ils.cstore' oils_obj:fieldmapper='container::biblio_record_entry_bucket_item' oils_persist:tablename='container.biblio_record_entry_bucket_item' reporter:label='Biblio Record Entry Bucket Item'>
+		<fields oils_persist:primary='id' oils_persist:sequence='container.biblio_record_entry_bucket_item_id_seq'>
+			<field name='bucket' reporter:datatype='link'></field>
+			<field name='id' reporter:datatype='id'></field>
+			<field name='target_biblio_record_entry' reporter:datatype='link'></field>
+			<field name='create_time' reporter:datatype='timestamp'></field>
+			<field name='pos' reporter:datatype='int'></field>
+			<field name='notes' oils_persist:virtual='true' reporter:datatype='link'></field>
+		</fields>
+		<links>
+			<link field='target_biblio_record_entry' reltype='has_a' key='id' map='' class='bre'></link>
+			<link field='bucket' reltype='has_a' key='id' map='' class='cbreb'></link>
+            <link field='notes' reltype='has_many' map='' key='item' class='cbrebin'></link>
+		</links>
+	</class><class id='cbrebin' controller='open-ils.cstore' oils_obj:fieldmapper='container::biblio_record_entry_bucket_item_note' oils_persist:tablename='container.biblio_record_entry_bucket_item_note' reporter:label='Biblio Record Entry Bucket Item Note'>
+		<fields oils_persist:primary='id' oils_persist:sequence='container.biblio_record_entry_bucket_item_note_id_seq'>
+			<field name='id' reporter:datatype='id'></field>
+			<field name='item' reporter:datatype='link'></field>
+			<field name='note' reporter:datatype='text'></field>
+		</fields>
+		<links>
+			<link field='item' reltype='has_a' key='id' map='' class='cbrebi'></link>
+		</links>
+	</class><class id='ahtc' controller='open-ils.cstore open-ils.pcrud' oils_obj:fieldmapper='action::hold_transit_copy' oils_persist:tablename='action.hold_transit_copy' reporter:core='true' reporter:label='Hold Transit'>
+		<fields oils_persist:primary='id' oils_persist:sequence='action.transit_copy_id_seq'>
+			<field reporter:label='Copy Status at Transit' name='copy_status' reporter:datatype='link'></field>
+			<field reporter:label='Destination Library' name='dest' reporter:datatype='org_unit'></field>
+			<field reporter:label='Receive Date/Time' name='dest_recv_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Hold requiring Transit' name='hold' reporter:datatype='link'></field>
+			<field reporter:label='Transit ID' name='id' reporter:datatype='id'></field>
+			<field reporter:label='Is Persistent?' name='persistant_transfer' reporter:datatype='bool'></field>
+			<field reporter:label='Previous Stop' name='prev_hop' reporter:datatype='link'></field>
+			<field reporter:label='Sending Library' name='source' reporter:datatype='org_unit'></field>
+			<field reporter:label='Send Date/Time' name='source_send_time' reporter:datatype='timestamp'></field>
+			<field reporter:label='Transited Copy' name='target_copy' reporter:datatype='link'></field>
+			<field reporter:label='Base Transit' name='transit_copy' oils_persist:virtual='true' reporter:datatype='link'></field>
+			<field reporter:label='Prev Destination Library' name='prev_dest' reporter:datatype='org_unit'></field>
+		</fields>
+		<links>
+			<link field='transit_copy' reltype='might_have' key='id' map='' class='atc'></link>
+			<link field='target_copy' reltype='has_a' key='id' map='' class='acp'></link>
+			<link field='source' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='copy_status' reltype='has_a' key='id' map='' class='ccs'></link>
+			<link field='dest' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='prev_dest' reltype='has_a' key='id' map='' class='aou'></link>
+			<link field='hold' reltype='has_a' key='id' map='' class='ahr'></link>
+		</links>
+        <permacrud xmlns='http://open-ils.org/spec/opensrf/IDL/permacrud/v1'>
+            <actions>
+                <create permission='TRANSIT_COPY' context_field='owner'>
+                    <context link='target_copy' field='circ_lib'></context>
+                </create>
+                <retrieve></retrieve>
+                <update permission='UPDATE_TRANSIT' context_field='dest source'></update>
+                <delete permission='DELETE_TRANSIT' context_field='dest source'></delete>
+            </actions>
+        </permacrud>
+	</class></IDL>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/demo_app/demo_app.iml b/Open-ILS/src/Android/demo_app/demo_app.iml
new file mode 100644
index 0000000000..b366ef5d18
--- /dev/null
+++ b/Open-ILS/src/Android/demo_app/demo_app.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="UPDATE_PROPERTY_FILES" value="true" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core" />
+  </component>
+</module>
+
diff --git a/Open-ILS/src/Android/demo_app/res/values/ou.xml b/Open-ILS/src/Android/demo_app/res/values/ou.xml
index a4c6b11588..b7a85c2aba 100644
--- a/Open-ILS/src/Android/demo_app/res/values/ou.xml
+++ b/Open-ILS/src/Android/demo_app/res/values/ou.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- ou_cwmars.xml - C/W MARS organizational unit -->
+<!-- ou.xml - organizational unit app customization -->
 <resources>
-    <string name="ou_library_url">https://demo.evergreencatalog.com</string>
+    <string name="ou_account_type">com.evergreencatalog.demo</string>
+    <string name="ou_library_url">http://demo.evergreencatalog.com</string>
     <string name="ou_app_name">Evergreen Demo Library</string>
     <string name="ou_app_label">Evergreen Demo</string>
     <string name="ou_app_welcome_label">Welcome</string>