Incorporated opensrf2_serialized_reg as additional source files in the core project.

diff --git a/Open-ILS/src/Android/core/core.iml b/Open-ILS/src/Android/core/core.iml
index d6b092a..7c7437b 100644 (file)
--- a/Open-ILS/src/Android/core/core.iml
+++ b/Open-ILS/src/Android/core/core.iml
@@ -13,6 +13,10 @@
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
+    <content url="file://$MODULE_DIR$/../opensrf">
+      <sourceFolder url="file://$MODULE_DIR$/../opensrf/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../opensrf/src/org/opensrf/test" isTestSource="true" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="appcompat" exported="" />
@@ -39,15 +43,6 @@
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/opensrf2_android.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
           <root url="jar://$MODULE_DIR$/libs/zxing_barcode.jar!/" />
         </CLASSES>
         <JAVADOC />

diff --git a/Open-ILS/src/Android/core/libs/opensrf2_android.jar b/Open-ILS/src/Android/core/libs/opensrf2_android.jar
deleted file mode 100644 (file)
index 11940e0..0000000
Binary files a/Open-ILS/src/Android/core/libs/opensrf2_android.jar and /dev/null differ

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/compiler.xml b/Open-ILS/src/Android/cwmars_app/.idea/compiler.xml
index 217af47..48555b6 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/.idea/compiler.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/compiler.xml
@@ -2,6 +2,10 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/util/Cache.java" />
+      <file url="file://$PROJECT_DIR$/../opensrf/src/org/opensrf/test/TestCache.java" />
+    </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -19,5 +23,4 @@
       </profile>
     </annotationProcessing>
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/modules.xml b/Open-ILS/src/Android/cwmars_app/.idea/modules.xml
index f2d76fd..de20113 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/.idea/modules.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/modules.xml
@@ -7,5 +7,4 @@
       <module fileurl="file://$PROJECT_DIR$/cwmars_app.iml" filepath="$PROJECT_DIR$/cwmars_app.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml b/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml
index 6fa91bc..cdecbf4 100644 (file)
--- a/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml
+++ b/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml
@@ -12,7 +12,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library" exported="">
       <library>
@@ -33,5 +33,4 @@
       </library>
     </orderEntry>
   </component>
-</module>
-
+</module>
\ No newline at end of file