diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index bdba5fe2d..de0b08c18 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -33,6 +33,7 @@
       <excludes>
         <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
         <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+        <exclude>junit:junit</exclude>
         <exclude>*:jdk14</exclude>
       </excludes>
     </dependencySet>
@@ -53,6 +54,7 @@
       <includes>
         <include>FREEMARKER-LICENSE.txt</include>
         <include>OGNL-LICENSE.txt</include>
+        <include>XWORK-LICENSE.txt</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -62,6 +64,14 @@
         <include>CLASSWORLDS-LICENSE.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../plugins/rest/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>XSTREAM-LICENSE.txt</include>
+        <include>XPP3-LICENSE.txt</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>../plugins/sitemesh/src/main/resources</directory>
       <outputDirectory></outputDirectory>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index d72a734be..2c9536cc4 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -33,6 +33,7 @@
       <excludes>
         <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
         <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+        <exclude>junit:junit</exclude>
         <exclude>*:jdk14</exclude>
       </excludes>
     </dependencySet>
@@ -53,6 +54,7 @@
       <includes>
         <include>FREEMARKER-LICENSE.txt</include>
         <include>OGNL-LICENSE.txt</include>
+        <include>XWORK-LICENSE.txt</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -62,6 +64,14 @@
         <include>CLASSWORLDS-LICENSE.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../plugins/rest/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>XSTREAM-LICENSE.txt</include>
+        <include>XPP3-LICENSE.txt</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>../plugins/sitemesh/src/main/resources</directory>
       <outputDirectory></outputDirectory>
diff --git a/assembly/src/main/resources/NOTICE.txt b/assembly/src/main/resources/NOTICE.txt
index 77e43f66d..c3d70d511 100644
--- a/assembly/src/main/resources/NOTICE.txt
+++ b/assembly/src/main/resources/NOTICE.txt
@@ -15,3 +15,6 @@ JSON-lib (http://json-lib.sourceforge.net/).
 OGNL (http://www.opensymphony.com/ognl/).
 Plexus (http://plexus.codehaus.org/).
 SiteMesh (http://www.opensymphony.com/sitemesh/).
+XWork (http://www.opensymphony.com/xwork/).
+XPP3 (http://www.extreme.indiana.edu/xgws/xsoap/xpp/).
+XStream (http://xstream.codehaus.org/).
diff --git a/core/src/main/resources/NOTICE.txt b/core/src/main/resources/NOTICE.txt
index 1e30a49f3..e900e84da 100644
--- a/core/src/main/resources/NOTICE.txt
+++ b/core/src/main/resources/NOTICE.txt
@@ -8,3 +8,4 @@ domTT (http://www.mojavelinux.com/projects/domtooltip/).
 The binary distributions includes the following third party software:
 FreeMarker (http://freemarker.org/).
 OGNL (http://www.opensymphony.com/ognl/).
+XWork (http://www.opensymphony.com/xwork/).
diff --git a/core/src/main/resources/XWORK-LICENSE.txt b/core/src/main/resources/XWORK-LICENSE.txt
new file mode 100644
index 000000000..0e293140a
--- /dev/null
+++ b/core/src/main/resources/XWORK-LICENSE.txt
@@ -0,0 +1,51 @@
+/* ====================================================================
+ * The OpenSymphony Software License, Version 1.1
+ *
+ * (this license is derived and fully compatible with the Apache Software
+ * License - see http://www.apache.org/LICENSE.txt)
+ *
+ * Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        OpenSymphony Group (http://www.opensymphony.com/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "OpenSymphony" and "The OpenSymphony Group"
+ *    must not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact license@opensymphony.com .
+ *
+ * 5. Products derived from this software may not be called "OpenSymphony"
+ *    or "XWork", nor may "OpenSymphony" or "XWork" appear in their
+ *    name, without prior written permission of the OpenSymphony Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ */
+ 
\ No newline at end of file
diff --git a/plugins/rest/src/main/resources/NOTICE.txt b/plugins/rest/src/main/resources/NOTICE.txt
index 9d1fea123..e69b42cfc 100644
--- a/plugins/rest/src/main/resources/NOTICE.txt
+++ b/plugins/rest/src/main/resources/NOTICE.txt
@@ -7,3 +7,5 @@ The Apache Software Foundation (http://www.apache.org/).
 The binary distributions includes the following third party software:
 EZMorph (http://ezmorph.sourceforge.net/)
 JSON-lib (http://json-lib.sourceforge.net/).
+XPP3 (http://www.extreme.indiana.edu/xgws/xsoap/xpp/).
+XStream (http://xstream.codehaus.org/).
diff --git a/plugins/rest/src/main/resources/XPP3-LICENSE.txt b/plugins/rest/src/main/resources/XPP3-LICENSE.txt
new file mode 100644
index 000000000..4cc7224e8
--- /dev/null
+++ b/plugins/rest/src/main/resources/XPP3-LICENSE.txt
@@ -0,0 +1,46 @@
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in 
+   the documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, 
+   must include the following acknowledgment:
+
+  "This product includes software developed by the Indiana University 
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself, 
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
+must not be used to endorse or promote products derived from this 
+software without prior written permission. For written permission, 
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy" 
+name nor may "Indiana Univeristy" appear in their name, without prior 
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt b/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt
new file mode 100644
index 000000000..36a242247
--- /dev/null
+++ b/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer. Redistributions in binary form must reproduce
+the above copyright notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of XStream nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.