9 files changed, 90 insertions, 12 deletions
diff --git a/flash-src/.gitignore b/flash-src/.gitignore
new file mode 100644
index 0000000..56fb545
--- /dev/null
+++ b/flash-src/.gitignore
@@ -0,0 +1 @@
+build.properties
diff --git a/flash-src/build.properties.sample b/flash-src/build.properties.sample
new file mode 100644
index 0000000..6ae8786
--- /dev/null
+++ b/flash-src/build.properties.sample
@@ -0,0 +1,2 @@
+# Point this to your Flex SDK directory.
+FLEX_HOME=/usr/local/share/flex_sdk_4
diff --git a/flash-src/build.sh b/flash-src/build.sh
index 598674a..0fb02a5 100755
--- a/flash-src/build.sh
+++ b/flash-src/build.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+# A script to build WebSocketMain.swf and WebSocketMainInsecure.zip.
+
 # You need Flex 4 SDK:
 # http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+4
 
-mxmlc -static-link-runtime-shared-libraries -target-player=10.0.0 -output=../WebSocketMain.swf WebSocketMain.as &&
-mxmlc -static-link-runtime-shared-libraries -output=../WebSocketMainInsecure.swf WebSocketMainInsecure.as &&
+mxmlc -static-link-runtime-shared-libraries -target-player=10.0.0 -output=../WebSocketMain.swf -source-path=. net/gimite/websocket/WebSocketMain.as &&
+mxmlc -static-link-runtime-shared-libraries -output=../WebSocketMainInsecure.swf -source-path=. net/gimite/websocket/WebSocketMainInsecure.as &&
 cd .. &&
 zip WebSocketMainInsecure.zip WebSocketMainInsecure.swf &&
 rm WebSocketMainInsecure.swf 
diff --git a/flash-src/build.xml b/flash-src/build.xml
new file mode 100644
index 0000000..9f42796
--- /dev/null
+++ b/flash-src/build.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Ant build file which provides Yet another way (other than build.sh) to build SWF files.
+  
+  You need to copy build.properties.sample to build.properties and change FLEX_HOME
+  for your environment.
+-->
+
+<project name="ant" basedir="." default="swf">
+
+<property file="build.properties" /><!-- set sdk -->
+<echo message="Using SDK version: ${FLEX_HOME}" />
+<!-- do not change next 2 lines, it adds needed task to ant -->
+<property name="FLEXTASKS" value="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+<taskdef resource="flexTasks.tasks" classpath="${FLEXTASKS}"/>
+
+<target name="swf">
+  <delete file="../WebSocketMain.swf"/>
+  <mxmlc file="net/gimite/websocket/WebSocketMain.as"
+         output="../WebSocketMain.swf"
+         incremental="false"
+         strict="true"
+         accessible="false"
+         fork="true"
+         static-link-runtime-shared-libraries="true">
+    <optimize>true</optimize>
+    <target-player>10</target-player>
+    <raw-metadata></raw-metadata>
+    <source-path path-element="."/>
+  </mxmlc>
+</target>
+
+<target name="swfInsecure">
+  <delete file="../WebSocketMainInsecure.swf" />
+  <mxmlc file="net/gimite/websocket/WebSocketMainInsecure.as"
+         output="../WebSocketMainInsecure.swf"
+         incremental="false"
+         strict="true"
+         accessible="false"
+         fork="true"
+         static-link-runtime-shared-libraries="true">
+    <optimize>true</optimize>
+    <target-player>10</target-player>
+    <raw-metadata></raw-metadata>
+    <source-path path-element="."/>
+  </mxmlc>
+</target>
+
+<target name="swc" ><!-- for pure .as -->
+  <delete file="../WebSocket.swc" />
+  <compc output="../WebSocket.swc"
+         incremental="false"
+         strict="true"
+         accessible="false"
+         fork="true"
+         static-link-runtime-shared-libraries="false">
+    <optimize>true</optimize>
+    <raw-metadata></raw-metadata>
+    <include-sources  dir="." includes="**/*.as"/>
+    <source-path path-element="."/>
+  </compc>
+</target>
+
+</project>
+    
+\ No newline at end of file
diff --git a/flash-src/IWebSocketLogger.as b/flash-src/net/gimite/websocket/IWebSocketLogger.as
index 24f4ef7..c3384f3 100644
--- a/flash-src/IWebSocketLogger.as
+++ b/flash-src/net/gimite/websocket/IWebSocketLogger.as
@@ -1,4 +1,7 @@
-package {
+// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
+// License: New BSD License
+
+package net.gimite.websocket {
 
 public interface IWebSocketLogger {
   function log(message:String):void;
diff --git a/flash-src/WebSocket.as b/flash-src/net/gimite/websocket/WebSocket.as
index 63ee5af..3bafd63 100644
--- a/flash-src/WebSocket.as
+++ b/flash-src/net/gimite/websocket/WebSocket.as
@@ -3,7 +3,7 @@
 // Reference: http://dev.w3.org/html5/websockets/
 // Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
 
-package {
+package net.gimite.websocket {
 
 import com.adobe.net.proxies.RFC2817Socket;
 import com.gsolo.encryption.MD5;
@@ -292,9 +292,11 @@ public class WebSocket extends EventDispatcher {
   private function onSocketIoError(event:IOErrorEvent):void {
     var message:String;
     if (readyState == CONNECTING) {
-      message = "cannot connect to Web Socket server at " + url + " (IoError)";
+      message = "cannot connect to Web Socket server at " + url + " (IoError: " + event.text + ")";
     } else {
-      message = "error communicating with Web Socket server at " + url + " (IoError)";
+      message =
+          "error communicating with Web Socket server at " + url +
+          " (IoError: " + event.text + ")";
     }
     onError(message);
   }
@@ -303,10 +305,12 @@ public class WebSocket extends EventDispatcher {
     var message:String;
     if (readyState == CONNECTING) {
       message =
-          "cannot connect to Web Socket server at " + url + " (SecurityError)\n" +
+          "cannot connect to Web Socket server at " + url + " (SecurityError: " + event.text + ")\n" +
           "make sure the server is running and Flash socket policy file is correctly placed";
     } else {
-      message = "error communicating with Web Socket server at " + url + " (SecurityError)";
+      message =
+          "error communicating with Web Socket server at " + url +
+          " (SecurityError: " + event.text + ")";
     }
     onError(message);
   }
diff --git a/flash-src/WebSocketEvent.as b/flash-src/net/gimite/websocket/WebSocketEvent.as
index 598eeb2..aa17cac 100644
--- a/flash-src/WebSocketEvent.as
+++ b/flash-src/net/gimite/websocket/WebSocketEvent.as
@@ -1,4 +1,4 @@
-package {
+package net.gimite.websocket {
 
 import flash.events.Event;
 
diff --git a/flash-src/WebSocketMain.as b/flash-src/net/gimite/websocket/WebSocketMain.as
index 10fb3af..891a5d1 100644
--- a/flash-src/WebSocketMain.as
+++ b/flash-src/net/gimite/websocket/WebSocketMain.as
@@ -3,7 +3,7 @@
 // Reference: http://dev.w3.org/html5/websockets/
 // Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07 
 
-package {
+package net.gimite.websocket {
 
 import flash.display.Sprite;
 import flash.external.ExternalInterface;
diff --git a/flash-src/WebSocketMainInsecure.as b/flash-src/net/gimite/websocket/WebSocketMainInsecure.as
index 1c5e8d5..eb4f426 100644
--- a/flash-src/WebSocketMainInsecure.as
+++ b/flash-src/net/gimite/websocket/WebSocketMainInsecure.as
@@ -3,9 +3,9 @@
 // Reference: http://dev.w3.org/html5/websockets/
 // Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
 
-package {
+package net.gimite.websocket {
 
-import flash.system.*;
+import flash.system.Security;
 
 public class WebSocketMainInsecure extends WebSocketMain {