diff --git a/LICENSE.txt b/LICENSE.txt
index 9e0a707..f1c8e92 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -240,7 +240,7 @@
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 THE POSSIBILITY OF SUCH DAMAGE.
-
+================================
 
 For the org.json library:
 
@@ -266,7 +266,7 @@
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+================================
 
 For the SLF4J library:
 
@@ -291,27 +291,28 @@
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+================================
 
 For the Spring framework set of libraries:
 
 Spring Framework is licensed under the Apache 2 license, as given above.
-
+================================
 
 For the Jakarta ORO library:
 
 ORO is licensed under the Apache 2 license, as given above.
-
+================================
 
 For the OSGI library:
 
 OSGI is licensed under the Apache 2 license, as given above.
-
+================================
 
 For the Apache Hadoop library:
 
 Hadoop is licensed under the Apache 2 license, as given above.
 
+================================
 
 For the JDOM component :
 
@@ -365,10 +366,221 @@
 Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
 on the JDOM Project, please see <http://www.jdom.org/>.
 
+================================
+For the aspectj runtime & weaver libraries
 
-For the javax libraries,
+Eclipse Public License - v 1.0
 
-javax libraries are licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1.
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
+ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
+OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S
+ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial code and
+     documentation distributed under this Agreement, and
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+
+where such changes and/or additions to the Program originate
+from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was
+added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not
+include additions to the Program which: (i) are separate
+modules of software distributed in conjunction with the
+Program under their own license agreement, and (ii) are
+not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes
+the Program.
+
+"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or
+sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance
+with this Agreement.
+
+"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor
+   hereby grants Recipient a non-exclusive, worldwide,
+   royalty-free copyright license to reproduce, prepare
+   derivative works of, publicly display, publicly perform,
+   distribute and sublicense the Contribution of such Contributor,
+   if any, and such derivative works, in source code and object
+   code form.
+b) Subject to the terms of this Agreement, each Contributor
+   hereby grants Recipient a non-exclusive, worldwide,
+   royalty-free patent license under Licensed Patents to make,
+   use, sell, offer to sell, import and otherwise transfer the
+   Contribution of such Contributor, if any, in source code
+   and object code form. This patent license shall apply to
+   the combination of the Contribution and the Program if,
+   at the time the Contribution is added by the Contributor,
+   such addition of the Contribution causes such combination to
+   be covered by the Licensed Patents. The patent license shall
+   not apply to any other combinations which include the
+   Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants
+   the licenses to its Contributions set forth herein, no assurances
+   are provided by any Contributor that the Program does not
+   infringe the patent or other intellectual property rights of
+   any other entity. Each Contributor disclaims any liability to
+   Recipient for claims brought by any other entity based on
+   infringement of intellectual property rights or otherwise.
+   As a condition to exercising the rights and licenses granted
+   hereunder, each Recipient hereby assumes sole responsibility
+   to secure any other intellectual property rights needed, if
+   any. For example, if a third party patent license is required
+   to allow Recipient to distribute the Program, it is Recipient's
+   responsibility to acquire that license before distributing the
+   Program.
+d) Each Contributor represents that to its knowledge it has
+   sufficient copyright rights in its Contribution, if any, to
+   grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:
+
+   a) it complies with the terms and conditions of this Agreement; and
+   b) its license agreement:
+      i) effectively disclaims on behalf of all Contributors all
+         warranties and conditions, express and implied, including
+         warranties or conditions of title and non-infringement, and
+         implied warranties or conditions of merchantability and
+         fitness for a particular purpose;
+      ii) effectively excludes on behalf of all Contributors all
+          liability for damages, including direct, indirect, special,
+          incidental and consequential damages, such as lost profits;
+      iii) states that any provisions which differ from this Agreement
+          are offered by that Contributor alone and not by any other
+          party; and
+      iv) states that source code for the Program is available from
+          such Contributor, and informs licensees how to obtain it in
+          a reasonable manner on or through a medium customarily used
+          for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, 
+if any, in a manner that reasonably allows subsequent Recipients to identify 
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with 
+respect to end users, business partners and the like. While this license is 
+intended to facilitate the commercial use of the Program, the Contributor who 
+includes the Program in a commercial product offering should do so in a manner 
+which does not create potential liability for other Contributors. Therefore, 
+if a Contributor includes the Program in a commercial product offering, 
+such Contributor ("Commercial Contributor") hereby agrees to defend and 
+indemnify every other Contributor ("Indemnified Contributor") against any 
+losses, damages and costs (collectively "Losses") arising from claims, lawsuits 
+and other legal actions brought by a third party against the Indemnified 
+Contributor to the extent caused by the acts or omissions of such Commercial 
+Contributor in connection with its distribution of the Program in a commercial 
+product offering. The obligations in this section do not apply to any claims or 
+Losses relating to any actual or alleged intellectual property infringement. 
+In order to qualify, an Indemnified Contributor must: 
+a) promptly notify the Commercial Contributor in writing of such claim, and 
+b) allow the Commercial Contributor to control, and cooperate with the Commercial 
+   Contributor in, the defense and any related settlement negotiations. The 
+   Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product 
+offering, Product X. That Contributor is then a Commercial Contributor. If that 
+Commercial Contributor then makes performance claims, or offers warranties 
+related to Product X, those performance claims and warranties are such Commercial 
+Contributor's responsibility alone. Under this section, the Commercial Contributor 
+would have to defend claims against the other Contributors related to those 
+performance claims and warranties, and if a court requires any other Contributor 
+to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN 
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR 
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, 
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each 
+Recipient is solely responsible for determining the appropriateness of using and 
+distributing the Program and assumes all risks associated with its exercise of 
+rights under this Agreement , including but not limited to the risks and costs of 
+program errors, compliance with applicable laws, damage to or loss of data, programs 
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY 
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST 
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED 
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, 
+it shall not affect the validity or enforceability of the remainder of the terms of 
+this Agreement, and without further action by the parties hereto, such provision shall 
+be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim 
+or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations 
+of the Program with other software or hardware) infringes such Recipient's patent(s), 
+then such Recipient's rights granted under Section 2(b) shall terminate as of the date 
+such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with 
+any of the material terms or conditions of this Agreement and does not cure such 
+failure in a reasonable period of time after becoming aware of such noncompliance. 
+If all Recipient's rights under this Agreement terminate, Recipient agrees to cease 
+use and distribution of the Program as soon as reasonably practicable. However, 
+Recipient's obligations under this Agreement and any licenses granted by Recipient 
+relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to 
+avoid inconsistency the Agreement is copyrighted and may only be modified in the 
+following manner. The Agreement Steward reserves the right to publish new versions 
+(including revisions) of this Agreement from time to time. No one other than the 
+Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is 
+the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to 
+serve as the Agreement Steward to a suitable separate entity. Each new version of the 
+Agreement will be given a distinguishing version number. The Program (including 
+Contributions) may always be distributed subject to the version of the Agreement under 
+which it was received. In addition, after a new version of the Agreement is published, 
+Contributor may elect to distribute the Program (including its Contributions) under 
+the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient 
+receives no rights or licenses to the intellectual property of any Contributor under 
+this Agreement, whether expressly, by implication, estoppel or otherwise. All rights 
+in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual 
+property laws of the United States of America. No party to this Agreement will bring 
+a legal action under this Agreement more than one year after the cause of action arose. 
+Each party waives its rights to a jury trial in any resulting litigation.
+
+================================
+For the javax libraries and junit,
+
+javax libraries and junit are licensed under the
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0.
 
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
@@ -750,3 +962,37 @@
 distribute such responsibility on an equitable basis. Nothing
 herein is intended or shall be deemed to constitute any admission
 of liability.
+
+===================
+For MXP1: Xml Pull Parser 3rd Edition (XPP3)
+
+Public Domain
+
+The person or persons who have associated work with this document
+(the "Dedicator" or "Certifier") hereby either (a) certifies that, to
+the best of his knowledge, the work of authorship identified is in
+the public domain of the country from which the work is published, or
+(b) hereby dedicates whatever copyright the dedicators holds in the
+work of authorship identified below (the "Work") to the public domain.
+A certifier, moreover, dedicates any copyright interest he may have
+in the associated work, and for these purposes, is described as a
+"dedicator" below.
+
+A certifier has taken reasonable steps to verify the copyright status
+of this work. Certifier recognizes that his good faith efforts may not
+shield him from liability if in fact the work certified is not in the
+public domain.
+
+Dedicator makes this dedication for the benefit of the public at large
+and to the detriment of the Dedicator's heirs and successors. Dedicator
+intends this dedication to be an overt act of relinquishment in
+perpetuity of all present and future rights under copyright law, whether
+vested or contingent, in the Work. Dedicator understands that such
+relinquishment of all rights includes the relinquishment of all rights
+to enforce (by lawsuit or otherwise) those copyrights in the Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work may
+be freely reproduced, distributed, transmitted, used, modified, built upon,
+or otherwise exploited by anyone for any purpose, commercial or
+non-commercial, and in any way, including by methods that have not yet been
+invented or conceived.
\ No newline at end of file
diff --git a/NOTICE.txt b/NOTICE.txt
index 9fd9473..34dc239 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -17,9 +17,22 @@
 This product includes SLF4J (http://www.slf4j.org/),
 Copyright (c) 2004-2008 QOS.ch
 
-This product includes javax.(jms,servlet,servlet.jsp,xml.bind) libraries
+This product includes javax.(jms,servlet,servlet.jsp,xml.bind)
+libraries and junit under
 (https://glassfish.java.net/public/CDDLv1.0.html),
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1.
 
 This product includes JDOM,
-Copyright (C) 2000-2011 Jason Hunter & Brett McLaughlin.
\ No newline at end of file
+Copyright (C) 2000-2011 Jason Hunter & Brett McLaughlin.
+
+This product include aspectj runtime & weaver libraries under
+(http://www.eclipse.org/legal/epl-v10.html)
+Eclipse Public License - Version 1.0
+
+This product includes MXP1: Xml Pull Parser 3rd Edition (XPP3) &
+AOP alliance (http://aopalliance.sourceforge.net) under
+(http://creativecommons.org/licenses/publicdomain/)
+Creative Commons - Public Domain
+
+This product includes HSQLDB (http://hsqldb.org/)
+HSQLDB License
diff --git a/client/pom.xml b/client/pom.xml
index a281819..00a316d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -34,11 +34,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 456d66e..3875baf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,12 +278,6 @@
             </dependency>
 
             <dependency>
-                <groupId>com.thoughtworks.xstream</groupId>
-                <artifactId>xstream</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-
-            <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.2</version>
@@ -622,6 +616,14 @@
                     <include>log4j.xml</include>
                 </includes>
             </resource>
+            <resource>
+              <directory>..</directory>
+              <targetPath>META-INF</targetPath>
+              <includes>
+                <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+              </includes>
+            </resource>
         </resources>
         <testResources>
             <testResource>