working version of cn1lib

yishai-glide · Jul 4, 2013 · 1b5b802 · 1b5b802
1 parent 6ef1e82
commit 1b5b802
Show file tree

Hide file tree

Showing 40 changed files with 640 additions and 86 deletions.
diff --git a/android/Pubnub-Android-3.5.2.jar b/android/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.2.jar b/blackberry/Pubnub-BlackBerry-3.5.2.jar
diff --git a/codenameone/PubnubClientSDK/build.xml b/codenameone/PubnubClientSDK/build.xml
@@ -5,6 +5,7 @@
 <project name="PubnubClientSDK" default="build" basedir=".">
     <description>Builds, tests, and runs the project PubnubClientSDK.</description>
     <import file="nbproject/build-impl.xml"/>
+    <loadfile property="VERSION" srcFile="../../VERSION"><filterchain><striplinebreaks/></filterchain></loadfile>
     <property file="codenameone_settings.properties"/>
 
     <target name="create-src">
@@ -13,6 +14,9 @@
             <fileset dir="../srcJson"/>
             <fileset dir="../../java/srcPubnubApi"/>
         </copy>
+        <copy includeemptydirs="true" todir="src/com/codename1">
+            <fileset dir="../src/com/codename1"/>
+        </copy>
         <copy includeemptydirs="true" todir="src/com/pubnub/api">
             <fileset dir="../src/com/pubnub/api/"/>
         </copy>
@@ -21,11 +25,11 @@
         <delete dir="src"/>
     </target>
     <target name="copy-lib">
-        <copy file="dist/PubnubClientSDK.cn1lib" tofile="../pubnub.cn1lib"/>
+        <copy file="dist/PubnubClientSDK.cn1lib" tofile="../pubnub-codenameone-${VERSION}.cn1lib"/>
     </target>
 
 
-    <target depends="default, delete-src, copy-lib, clean" name="build">
+    <target depends="create-src, default, delete-src, copy-lib, clean" name="build">
     </target>
 
     <target depends="init,compile,jar" name="compile-test">
@@ -68,7 +72,7 @@
     <target name="Stubs">
         <delete dir="build/stubs"/>
         <javadoc sourcepath="src"
-            classpath="lib/CodenameOne.jar:lib/CLDC11.jar"
+            classpath="lib/CodenameOne.jar:lib/CLDC11.jar:lib/bccn1/main.zip"
             docletpath="Stubber.jar"
             doclet="com.codename1.build.client.StubGenerator"> 
             <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
@@ -77,16 +81,16 @@
          </javadoc>
     </target>
 
-    <target name="jar" depends="compile,Stubs">
+    <target name="jar" depends="compile, Stubs">
         <mkdir dir="build/lib" />
         <zip basedir="${build.classes.dir}" compress="false" destfile="build/lib/main.zip" />
         <zip basedir="build/stubs" compress="false" destfile="build/lib/stubs.zip" />
         <copy file="manifest.properties" todir="build/lib" />
-        <antcall target="buildNativeIOS" />        
+        <!--<antcall target="buildNativeIOS" />        
         <antcall target="buildNativeRIM" />        
         <antcall target="buildNativeAND" />        
         <antcall target="buildNativeWIN" />        
-        <antcall target="buildNativeME" />       
+        <antcall target="buildNativeME" />    -->   
         <mkdir dir="dist" />
         <zip basedir="build/lib" compress="true" destfile="dist/${application.title}.cn1lib" />
     </target>

diff --git a/codenameone/pubnub-codenameone-3.5.2.cn1lib b/codenameone/pubnub-codenameone-3.5.2.cn1lib
diff --git a/codenameone/pubnub.cn1lib b/codenameone/pubnub.cn1lib
diff --git a/codenameone/src/com/codename1/io/PubnubCn1Connection.java b/codenameone/src/com/codename1/io/PubnubCn1Connection.java
@@ -0,0 +1,57 @@
+package com.codename1.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import com.codename1.impl.CodenameOneImplementation;
+import com.pubnub.api.HttpUtil;
+
+public class PubnubCn1Connection {
+
+	private CodenameOneImplementation impl = Util.getImplementation();
+	private Object connection = null;
+	private InputStream input = null;
+	private byte[] data = null;
+
+	public PubnubCn1Response fetch(String url, int timeout, Hashtable _headers) throws IOException {
+		int rc = 0;
+		String page = null;
+		int contentLength = 0;
+
+		while (HttpUtil.isRedirect(rc) || rc == 0) {
+			connection = impl.connect(url, true, false, timeout);
+			impl.setPostRequest(connection, false);
+
+			if(_headers != null) {
+				Enumeration e = _headers.keys();
+				while(e.hasMoreElements()) {
+					String k = (String)e.nextElement();
+					String value = (String)_headers.get(k);
+					impl.setHeader(connection, k, value);
+				}
+			}
+			rc = impl.getResponseCode(connection);
+			if(HttpUtil.isRedirect(rc)) {
+                String uri = impl.getHeaderField("location", connection);
+                if(!(uri.startsWith("http://") || uri.startsWith("https://"))) {
+                    url = Util.relativeToAbsolute(url, uri);
+                } else {
+                    url = uri;
+                }
+            }
+		}
+		contentLength = impl.getContentLength(connection);
+        input = impl.openInputStream(connection);
+        data = Util.readInputStream(input);
+        input.close();
+        input = null;
+		return new PubnubCn1Response(rc, new String(data, "UTF-8"));
+	}
+	public void disconnect() {
+
+	}
+
+}
+
diff --git a/codenameone/src/com/codename1/io/PubnubCn1Response.java b/codenameone/src/com/codename1/io/PubnubCn1Response.java
@@ -0,0 +1,17 @@
+package com.codename1.io;
+
+public class PubnubCn1Response {
+	private String response;
+	private int responseStatusCode;
+	public String getResponse() {
+		return response;
+	}
+	public int getResponseStatusCode() {
+		return responseStatusCode;
+	}
+	public PubnubCn1Response(int responseStatusCode, String response) {
+		this.response = response;
+		this.responseStatusCode = responseStatusCode;
+	}
+}
+
diff --git a/codenameone/src/com/pubnub/api/HttpClientCore.java b/codenameone/src/com/pubnub/api/HttpClientCore.java
@@ -10,16 +10,21 @@
 import java.util.Hashtable;
 
 import com.codename1.impl.CodenameOneImplementation;
-import com.codename1.io.Util;
+import com.codename1.io.*;
 
 class HttpClientCore extends HttpClient {
+
+
+    PubnubCn1Connection connection;
     private int requestTimeout = 310000;
     private int connectionTimeout = 5000;
-    //HttpURLConnection connection;
+
+
     protected static Logger log = new Logger(Worker.class);
 
     private void init() {
         //HttpURLConnection.setFollowRedirects(true);
+    	connection = new PubnubCn1Connection();
     }
 
     public HttpClientCore(int connectionTimeout, int requestTimeout, Hashtable headers) {
@@ -45,36 +50,19 @@ public void setConnectionTimeout(int connectionTimeout) {
         this.connectionTimeout = connectionTimeout;
     }
 
-    public boolean isRedirect(int rc) {
-       /* return (rc == HttpURLConnection.HTTP_MOVED_PERM
-                || rc == HttpURLConnection.HTTP_MOVED_TEMP || rc == HttpURLConnection.HTTP_SEE_OTHER);
-        */
-        return true;
-    }
-
-    public boolean checkResponse(int rc) {
-        return true; //return (rc == HttpURLConnection.HTTP_OK || isRedirect(rc));
-    }
-
-    public boolean checkResponseSuccess(int rc) {
-        return true; //return (rc == HttpURLConnection.HTTP_OK);
-    }
-    public HttpResponse fetch(String url) throws PubnubException { //, SocketTimeoutException {
+    public HttpResponse fetch(String url) throws PubnubException, IOException {
         return fetch(url, null);
     }
 
     public synchronized HttpResponse fetch(String url, Hashtable headers)
-            throws PubnubException {     //    log.verbose("URL = " + url + " : RESPONSE = " + page);
-        return null;//new HttpResponse(rc, page);
-    }
-
-    public boolean isOk(int rc) {
-        //return (rc == HttpURLConnection.HTTP_OK);
-        return true;
+            throws PubnubException, IOException {
+        System.out.println(url);
+        PubnubCn1Response pcr = connection.fetch(url, requestTimeout, headers);
+    	return new HttpResponse(pcr.getResponseStatusCode(), pcr.getResponse());//new HttpResponse(rc, page);
     }
 
     public void shutdown() {
-        //if (connection != null) connection.disconnect();
+        if (connection != null) connection.disconnect();
     }
 }
 
diff --git a/codenameone/src/com/pubnub/api/Logger.java b/codenameone/src/com/pubnub/api/Logger.java
@@ -3,22 +3,22 @@
 //import org.slf4j.LoggerFactory;
 
 class Cn1Logger {
-
-    public Cn1Logger(Class c) {
-
-    }
-    public void debug(String s) {
-
-    }
-    public void trace(String s) {
-
-    }
-    public void error(String s) {
-
-    }
-    public void info(String s) {
-
-    }
+	
+	public Cn1Logger(Class c) {
+		
+	}
+	public void debug(String s) {
+		
+	}
+	public void trace(String s) {
+		
+	}
+	public void error(String s) {
+		
+	}
+	public void info(String s) {
+		
+	}
 }
 
 

diff --git a/codenameone/src/com/pubnub/api/PubnubUtil.java b/codenameone/src/com/pubnub/api/PubnubUtil.java
@@ -1,6 +1,6 @@
 package com.pubnub.api;
 
-
+import com.codename1.io.Util;
 /**
  * PubnubUtil class provides utility methods like urlEncode etc
  * @author Pubnub
@@ -16,7 +16,6 @@ public class PubnubUtil extends PubnubUtilCore {
      * @return , encoded string
      */
     public static String urlEncode(String sUrl) {
-        // TODO
-        return null;
+        return Util.encodeUrl(sUrl);
     }
 }
diff --git a/codenameone/src/com/pubnub/api/SubscribeWorker.java b/codenameone/src/com/pubnub/api/SubscribeWorker.java
@@ -30,7 +30,7 @@ void process(HttpRequest hreq) {
                 log.debug(hreq.getUrl());
                 hresp = httpclient.fetch(hreq.getUrl(), hreq.getHeaders());
                 if (hresp != null
-                        && httpclient.checkResponseSuccess(hresp
+                        && HttpUtil.checkResponseSuccess(hresp
                                 .getStatusCode())) {
                     currentRetryAttempt = 1;
                     break;

diff --git a/j2me/Pubnub-MicroEdition-3.5.2.jar b/j2me/Pubnub-MicroEdition-3.5.2.jar
diff --git a/j2me/src1/com/pubnub/api/SubscribeWorker.java b/j2me/src1/com/pubnub/api/SubscribeWorker.java
@@ -20,7 +20,7 @@ void process(HttpRequest hreq) {
                 log.debug(hreq.getUrl());
                 hresp = httpclient.fetch(hreq.getUrl(), hreq.getHeaders());
                 if (hresp != null
-                        && httpclient.checkResponseSuccess(hresp
+                        && HttpUtil.checkResponseSuccess(hresp
                                 .getStatusCode())) {
                     currentRetryAttempt = 1;
                     break;

diff --git a/java/Pubnub-StandardEdition-3.5.2.jar b/java/Pubnub-StandardEdition-3.5.2.jar
diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Thu Jul 04 14:38:08 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Jul 04 17:15:29 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
@@ -23,6 +23,8 @@
 <TR>
 <TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/pubnub/api/Callback.html" title="class in com.pubnub.api" target="classFrame">Callback</A>
 <BR>
+<A HREF="com/pubnub/api/HttpUtil.html" title="class in com.pubnub.api" target="classFrame">HttpUtil</A>
+<BR>
 <A HREF="com/pubnub/api/Pubnub.html" title="class in com.pubnub.api" target="classFrame">Pubnub</A>
 <BR>
 <A HREF="com/pubnub/api/PubnubError.html" title="class in com.pubnub.api" target="classFrame">PubnubError</A>

diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Thu Jul 04 14:38:08 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Jul 04 17:15:29 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
@@ -23,6 +23,8 @@
 <TR>
 <TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/pubnub/api/Callback.html" title="class in com.pubnub.api">Callback</A>
 <BR>
+<A HREF="com/pubnub/api/HttpUtil.html" title="class in com.pubnub.api">HttpUtil</A>
+<BR>
 <A HREF="com/pubnub/api/Pubnub.html" title="class in com.pubnub.api">Pubnub</A>
 <BR>
 <A HREF="com/pubnub/api/PubnubError.html" title="class in com.pubnub.api">PubnubError</A>

diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Thu Jul 04 14:38:06 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Thu Jul 04 17:15:28 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
@@ -54,7 +54,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../com/pubnub/api/Pubnub.html" title="class in com.pubnub.api"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/pubnub/api/HttpUtil.html" title="class in com.pubnub.api"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/pubnub/api/Callback.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="Callback.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -348,7 +348,7 @@ <H2>
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../com/pubnub/api/Pubnub.html" title="class in com.pubnub.api"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/pubnub/api/HttpUtil.html" title="class in com.pubnub.api"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/pubnub/api/Callback.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="Callback.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;