Permalink
Browse files

Prepare aSmack for new the Smack version

  • Loading branch information...
1 parent 9f73870 commit 7951a645bd5aecfc06d0e0477a964c42836c0a5e @Flowdalic committed Feb 3, 2014
File renamed without changes.
View
View
@@ -52,31 +52,31 @@
<target name="compile-android" description="Compile for android" depends="check-android-exists" >
<delete dir="build/classes/${android.version}" failonerror="false" />
<mkdir dir="build/classes/${android.version}" />
- <mkdir dir="build/classes/${android.version}/trunk" />
<javac
target="6"
source="6"
- srcdir="build/src/trunk"
- destdir="build/classes/${android.version}/trunk"
- bootclasspath="${sdk-location}/platforms/${android.version}/android.jar:${jingle}"
+ srcdir="build/src"
+ destdir="build/classes/${android.version}"
+ bootclasspath="${sdk-location}/platforms/${android.version}/android.jar:lib/org.xbill.dns_2.1.6.jar:${jingle}"
debug="true"
debuglevel="source,lines"
/>
- <copy todir="build/classes/${android.version}/trunk">
- <fileset dir="build/src/trunk" includes="META-INF/**" />
+ <copy todir="build/classes/${android.version}">
+ <fileset dir="build/resources" />
</copy>
<jar
- basedir="build/classes/${android.version}/trunk"
+ basedir="build/classes/${android.version}"
destfile="build/asmack-${android.version}${jar.suffix}.jar"
filesonly="true"
level="9"
/>
<zip
- basedir="build/src/trunk"
destfile="build/asmack-${android.version}-source${jar.suffix}.zip"
filesonly="true"
- level="9"
- />
+ level="9">
+ <fileset dir="build/src"/>
+ <fileset dir="build/resources"/>
+ </zip>
</target>
Binary file not shown.
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm org/jivesoftware/smack/util/dns/JavaxResolver.java
@@ -1,6 +1,4 @@
#!/bin/bash
rm org/jivesoftware/smack/debugger/LiteDebugger.java
-rm org/jivesoftware/smackx/debugger/EnhancedDebugger.java
-rm org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
@@ -1,50 +0,0 @@
---- org/jivesoftware/smackx/pubsub/util/XmlUtils.java 2012-06-05 14:35:54.518687907 +0200
-+++ org/jivesoftware/smackx/pubsub/util/XmlUtils.java 2012-06-05 21:07:13.038946699 +0200
-@@ -14,47 +14,15 @@
- package org.jivesoftware.smackx.pubsub.util;
-
- import java.io.StringReader;
-
--import javax.xml.transform.OutputKeys;
--import javax.xml.transform.Transformer;
--import javax.xml.transform.TransformerFactory;
--import javax.xml.transform.stream.StreamResult;
--import javax.xml.transform.stream.StreamSource;
--
- /**
- * Simple utility for pretty printing xml.
- *
- * @author Robin Collier
- */
- public class XmlUtils
- {
-- /**
-- *
-- * @param header Just a title for the stanza for readability. Single word no spaces since
-- * it is inserted as the root element in the output.
-- * @param xml The string to pretty print
-- */
-- static public void prettyPrint(String header, String xml)
-- {
-- try
-- {
-- Transformer transformer = TransformerFactory.newInstance().newTransformer();
-- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-- transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "3");
--
-- if (header != null)
-- {
-- xml = "\n<" + header + ">" + xml + "</" + header + '>';
-- }
-- transformer.transform(new StreamSource(new StringReader(xml)), new StreamResult(System.out));
-- }
-- catch (Exception e)
-- {
-- System.out.println("Something wrong with xml in \n---------------\n" + xml + "\n---------------");
-- e.printStackTrace();
-- }
-- }
-
- static public void appendAttribute(StringBuilder builder, String att, String value)
- {
- builder.append(" ");
@@ -1,20 +1,20 @@
--- ../../src-unpatched/trunk/org/jivesoftware/smack/SASLAuthentication.java 2009-12-07 00:03:46.000000000 +0100
+++ org/jivesoftware/smack/SASLAuthentication.java 2009-12-07 00:05:46.000000000 +0100
@@ -91,11 +91,11 @@
- registerSASLMechanism("PLAIN", SASLPlainMechanism.class);
- registerSASLMechanism("ANONYMOUS", SASLAnonymous.class);
-
-- supportSASLMechanism("GSSAPI",0);
-- supportSASLMechanism("DIGEST-MD5",1);
-- supportSASLMechanism("CRAM-MD5",2);
-- supportSASLMechanism("PLAIN",3);
-- supportSASLMechanism("ANONYMOUS",4);
-+// supportSASLMechanism("GSSAPI",0);
-+ supportSASLMechanism("DIGEST-MD5",0);
-+// supportSASLMechanism("CRAM-MD5",2);
-+ supportSASLMechanism("PLAIN",1);
-+ supportSASLMechanism("ANONYMOUS",2);
-
- }
-
+ registerSASLMechanism("PLAIN", SASLPlainMechanism.class);
+ registerSASLMechanism("ANONYMOUS", SASLAnonymous.class);
+
+- supportSASLMechanism("GSSAPI",0);
+- supportSASLMechanism("DIGEST-MD5",1);
+- supportSASLMechanism("CRAM-MD5",2);
+- supportSASLMechanism("PLAIN",3);
+- supportSASLMechanism("ANONYMOUS",4);
++// supportSASLMechanism("GSSAPI",0);
++ supportSASLMechanism("DIGEST-MD5",0);
++// supportSASLMechanism("CRAM-MD5",2);
++ supportSASLMechanism("PLAIN",1);
++ supportSASLMechanism("ANONYMOUS",2);
+
+ }
+
@@ -1 +0,0 @@
-com.kenai.jbosh.ApacheHTTPSender
Oops, something went wrong. Retry.

0 comments on commit 7951a64

Please sign in to comment.