Restructure the organization of WBXML classes and code pages.

src/com/android/email/mail/internet/protocol/ActiveSyncProtocol.java

@@ -7,8 +7,10 @@ import com.android.email.Utility;
 import com.android.email.mail.Folder;
 import com.android.email.mail.ProtocolException;
 import com.android.email.mail.Store;
-import com.android.email.mail.internet.*;
-import com.android.email.mail.internet.WBXML;
+import com.android.email.mail.internet.HttpGeneric;
+import com.android.email.mail.internet.wbxml.activesync.*;
+import com.android.email.mail.internet.wbxml.WBXML;
+import com.android.email.mail.internet.wbxml.CodePage;
 import com.android.email.mail.internet.protocol.Protocol;
 import com.android.email.mail.store.ActiveSyncStore;
 import com.android.email.mail.transport.TrustedSocketFactory;

src/com/android/email/mail/internet/wbxml/CodePage.java

@@ -1,4 +1,4 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml;
 
 import java.util.HashMap;
 

src/com/android/email/mail/internet/wbxml/WBXML.java

@@ -1,4 +1,4 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedInputStream;
@@ -20,7 +20,7 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
 import com.android.email.Utility;
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class represents an entity for converting between WBXML and XML. The process uses

src/com/android/email/mail/internet/wbxml/activesync/AirNotifyCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for AirNotify in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/AirSyncBaseCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for AirSyncBase in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/AirSyncCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for AirSync in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/CalendarCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Calendar in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/Contacts2CodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Contacts2 in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/ContactsCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Contacts in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/DocumentLibraryCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for DocumentLibrary in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/EmailCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Emails in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/FolderHierarchyCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for FolderHierarchy in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/GALCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for GAL in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/ItemEstimateCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ItemEstimate in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/ItemOperationsCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ItemOperations in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/MeetingResponseCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for MeetingResponse in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/MoveCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Move in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/PingCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Ping in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/ProvisionCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Provision in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/ResolveRecipientsCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ResolveRecipients in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/SearchCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Search in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/SettingsCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Settings in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/TasksCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for Tasks in the ActiveSync protocol.

src/com/android/email/mail/internet/wbxml/activesync/ValidateCertCodePage.java

@@ -1,6 +1,6 @@
-package com.android.email.mail.internet;
+package com.android.email.mail.internet.wbxml.activesync;
 
-import com.android.email.mail.internet.CodePage;
+import com.android.email.mail.internet.wbxml.CodePage;
 
 /**
  * This class is the specific code page for ValidateCert in the ActiveSync protocol.