(j)bosh on asmack, missing patches

rtreffer · Feb 5, 2010 · 9dd53d1 · 9dd53d1
1 parent f751f01
commit 9dd53d1
Show file tree

Hide file tree

Showing 10 changed files with 762 additions and 15 deletions.
diff --git a/build.xml b/build.xml
@@ -44,11 +44,12 @@
       target="1.5"
       srcdir="build/src/trunk"
       destdir="build/classes/trunk"
-      classpath="lib/xmlpull_1_1_3_4c.jar"
+      classpath="lib/xmlpull_1_1_3_4c.jar:lib/httpclient-4.0.jar:lib/httpcore-4.0.1.jar"
       debug="true"
       debuglevel="source,lines"
       excludes="**/de/measite/smack/AndroidDebugger.java"
     />
+    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="**/*" /></copy>
     <jar
       basedir="build/classes/trunk"
       destfile="build/asmack-jse${jar.suffix}.jar"
@@ -77,6 +78,7 @@
       debug="true"
       debuglevel="source,lines"
     />
+    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="**/*" /></copy>
     <jar
       basedir="build/classes/trunk"
       destfile="build/asmack-android-2.0.1${jar.suffix}.jar"
@@ -131,6 +133,7 @@
       debug="true"
       debuglevel="source,lines"
     />
+    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="**/*" /></copy>
     <jar
       basedir="build/classes/trunk"
       destfile="build/asmack-android-1.6${jar.suffix}.jar"
@@ -158,6 +161,7 @@
       debug="true"
       debuglevel="source,lines"
     />
+    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="**/*" /></copy>
     <jar
       basedir="build/classes/trunk"
       destfile="build/asmack-android-1.5${jar.suffix}.jar"
@@ -185,6 +189,7 @@
       debug="true"
       debuglevel="source,lines"
     />
+    <copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="**/*" /></copy>
     <jar
       basedir="build/classes/trunk"
       destfile="build/asmack-android-1.1${jar.suffix}.jar"

diff --git a/lib/httpclient-4.0.jar b/lib/httpclient-4.0.jar
diff --git a/lib/httpcore-4.0.1.jar b/lib/httpcore-4.0.1.jar
diff --git a/patch/22-remove-beans.Property-deps.patch b/patch/22-remove-beans.Property-deps.patch
@@ -27,10 +27,4 @@
              }
              else if (eventType == XmlPullParser.END_TAG) {
                  if (parser.getName().equals(elementName)) {
-@@ -484,4 +483,4 @@
-         }
-         return null;
-     }
--}
-\ No newline at end of file
-+}
+
diff --git a/patch/24-disable-sasl-methods.patch b/patch/24-disable-sasl-methods.patch
@@ -17,10 +17,4 @@
 
      }
 
-@@ -553,4 +553,4 @@
-         resourceBinded = false;
-         sessionSupported = false;
-     }
--}
-\ No newline at end of file
-+}
+