Index: lams_build/build.xml
===================================================================
diff -u -re604030b7b751a1ead9cfd3e01e4e48c42a8ab19 -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/build.xml	(.../build.xml)	(revision e604030b7b751a1ead9cfd3e01e4e48c42a8ab19)
+++ lams_build/build.xml	(.../build.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -566,6 +566,13 @@
 		
 		
 		
+		<!-- WildFly does not load all classes from JDK that LAMS needs (com/sun/org/apache/xerces/internal)
+		     We need our own, extended list -->
+		<copy tofile="${server.home}/modules/system/layers/base/sun/jdk/main/module.xml"
+			  file="lib/jdk/jdk.module.xml" overwrite="true" verbose="true" />
+		
+		
+		
 		<copy todir="${server.home}/modules/system/layers/base/org/jdom/0.7" overwrite="true" verbose="true">
 			<fileset dir="lib/jdom">
 				<include name="jdom.jar" />
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -rb50d9d54756366de432a8d6613b5ead293ea5e17 -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision b50d9d54756366de432a8d6613b5ead293ea5e17)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -34,6 +34,7 @@
       <module name="org.apache.commons.fileupload" export="true" />
       <module name="org.apache.commons.httpclient" export="true" />
       <module name="org.apache.commons.validator" export="true" />
+      <module name="org.apache.xmlcommons" export="true" />
       <module name="org.infinispan" export="true" />
       <module name="org.hibernate" export="true" />
       <module name="org.jboss.jbossweb" export="true" />
Index: lams_build/lib/batik/batik.module.xml
===================================================================
diff -u -rcdf5749d174b01c2dcf85c42b303f4b49b2c4e1f -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/lib/batik/batik.module.xml	(.../batik.module.xml)	(revision cdf5749d174b01c2dcf85c42b303f4b49b2c4e1f)
+++ lams_build/lib/batik/batik.module.xml	(.../batik.module.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -26,4 +26,15 @@
   <resources>
     <resource-root path="batik-1.7.jar"/>
   </resources>
-</module>
+  
+  <dependencies>
+ 	<system>
+  		<paths>
+  			<path name="org/w3c/dom"/>
+  			<path name="org/w3c/dom/css"/>
+  			<path name="org/w3c/dom/traversal"/>
+  		</paths>
+  	</system>
+  	<module name="org.apache.xmlcommons" />
+  </dependencies>
+</module>
\ No newline at end of file
Index: lams_build/lib/jakarta-commons/fileupload.module.xml
===================================================================
diff -u -rcf3e4981d227b3b3c4bf934a56f8887853e118ef -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/lib/jakarta-commons/fileupload.module.xml	(.../fileupload.module.xml)	(revision cf3e4981d227b3b3c4bf934a56f8887853e118ef)
+++ lams_build/lib/jakarta-commons/fileupload.module.xml	(.../fileupload.module.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -25,5 +25,9 @@
 <module xmlns="urn:jboss:module:1.3" name="org.apache.commons.fileupload">
   <resources>
     <resource-root path="commons-fileupload.jar"/>
-  </resources>
-</module>
+  </resources>  
+  
+  <dependencies>
+  	<module name="javax.servlet.api" />
+  </dependencies>
+</module>
\ No newline at end of file
Index: lams_build/lib/jdk/jdk.module.xml
===================================================================
diff -u
--- lams_build/lib/jdk/jdk.module.xml	(revision 0)
+++ lams_build/lib/jdk/jdk.module.xml	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module xmlns="urn:jboss:module:1.3" name="sun.jdk">
+    <resources>
+        <!-- currently jboss modules has not way of importing services from
+        classes.jar so we duplicate them here -->
+        <resource-root path="service-loader-resources"/>
+    </resources>
+    <dependencies>
+        <system export="true">
+            <paths>
+                <path name="com/sun/script/javascript"/>
+                <path name="jdk/nashorn/api/scripting"/>
+                <path name="com/sun/image/codec/jpeg"/>
+                <path name="com/sun/imageio/plugins/bmp"/>
+                <path name="com/sun/imageio/plugins/common"/>
+                <path name="com/sun/imageio/plugins/gif"/>
+                <path name="com/sun/imageio/plugins/jpeg"/>
+                <path name="com/sun/imageio/plugins/png"/>
+                <path name="com/sun/imageio/plugins/wbmp"/>
+                <path name="com/sun/imageio/spi"/>
+                <path name="com/sun/imageio/stream"/>
+                <path name="com/sun/jndi/dns"/>
+                <path name="com/sun/jndi/ldap"/>
+                <path name="com/sun/jndi/url"/>
+                <path name="com/sun/jndi/url/corbaname"/>
+                <path name="com/sun/jndi/url/dns"/>
+                <path name="com/sun/jndi/url/iiop"/>
+                <path name="com/sun/jndi/url/iiopname"/>
+                <path name="com/sun/jndi/url/ldap"/>
+                <path name="com/sun/jndi/url/ldaps"/>
+                <path name="com/sun/media/sound"/>
+                <path name="com/sun/crypto/provider"/>
+                <path name="com/sun/org/apache/xml/internal/security/transforms/implementations"/>
+                <path name="com/sun/org/apache/xerces/internal/dom"/>
+				<path name="com/sun/org/apache/xerces/internal/xni"/>
+				<path name="com/sun/org/apache/xerces/internal/jaxp"/>
+                <path name="com/sun/security/auth"/>
+                <path name="com/sun/security/auth/login"/>
+                <path name="com/sun/security/auth/module"/>
+                <path name="com/sun/tools/internal/xjc"/>                
+                <path name="sun/awt"/>
+                <path name="sun/awt/color"/>
+                <path name="sun/awt/datatransfer"/>
+                <path name="sun/awt/dnd"/>
+                <path name="sun/awt/event"/>
+                <path name="sun/awt/geom"/>
+                <path name="sun/awt/im"/>
+                <path name="sun/awt/image"/>
+                <path name="sun/awt/image/codec"/>
+                <path name="sun/awt/motif"/>
+                <path name="sun/awt/resources"/>
+                <path name="sun/awt/shell"/>
+                <path name="sun/awt/util"/>
+                <path name="sun/awt/windows"/>
+                <path name="sun/awt/X11"/>
+                <path name="sun/dc"/>
+                <path name="sun/print"/>
+                <path name="sun/print/resources"/>
+                <path name="sun/security/action"/>
+                <path name="sun/security/pkcs"/>
+                <path name="sun/security/x509"/>
+                <path name="sun/jdbc/odbc"/>
+                <path name="sun/jdbc/odbc/ee"/>
+                <path name="sun/font"/>
+                <path name="sun/misc"/>
+                <path name="sun/io"/>
+                <path name="sun/nio"/>
+                <path name="sun/nio/ch"/>
+                <path name="sun/nio/cs"/>
+                <path name="sun/nio/cs/ext"/>
+                <path name="sun/security"/>
+                <path name="sun/security/util"/>
+                <path name="sun/security/krb5"/>
+                <path name="sun/util"/>
+                <path name="sun/util/calendar"/>
+                <path name="sun/util/locale"/>
+                <path name="sun/util/resources"/>
+                <path name="sun/security/pkcs11"/>
+                <path name="sun/security/provider"/>
+                <path name="sun/text"/>
+                <path name="META-INF/services"/>
+            </paths>
+            <exports>
+                <include-set>
+                    <path name="META-INF/services"/>
+                </include-set>
+            </exports>
+        </system>
+    </dependencies>
+</module>
\ No newline at end of file
Index: lams_build/lib/struts/struts.module.xml
===================================================================
diff -u -r7224a624e0d01dea3c6fc32d66723fbb67446754 -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/lib/struts/struts.module.xml	(.../struts.module.xml)	(revision 7224a624e0d01dea3c6fc32d66723fbb67446754)
+++ lams_build/lib/struts/struts.module.xml	(.../struts.module.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -35,6 +35,7 @@
     <module name="org.apache.commons.logging"/>
     <module name="org.apache.commons.digester"/>
     <module name="org.apache.commons.beanutils"/>
+    <module name="org.apache.commons.fileupload"/>
     <module name="org.apache.xmlcommons" />
   </dependencies>
-</module>
+</module>
\ No newline at end of file
Index: lams_build/lib/urlrewritefilter/urlrewrite.module.xml
===================================================================
diff -u -ra97551456cf5afd4f3ca943f18423aa89bc67fb2 -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/lib/urlrewritefilter/urlrewrite.module.xml	(.../urlrewrite.module.xml)	(revision a97551456cf5afd4f3ca943f18423aa89bc67fb2)
+++ lams_build/lib/urlrewritefilter/urlrewrite.module.xml	(.../urlrewrite.module.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -26,7 +26,16 @@
   <resources>
     <resource-root path="urlrewrite-3.2.0.jar"/>
   </resources>
+  
   <dependencies>
   	<module name="javax.servlet.api" />
+    <system>
+  		<paths>
+  			<path name="org/xml/sax"/>
+  			<path name="org/xml/sax/helpers"/>
+  			<path name="org/w3c/dom"/>
+  			<path name="javax/xml/parsers"/>
+  		</paths>
+  	</system>
   </dependencies>
 </module>
\ No newline at end of file
Index: lams_build/lib/wddx/wddx.module.xml
===================================================================
diff -u -r76a69094d6b55d08144a793fdab44114d751e766 -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/lib/wddx/wddx.module.xml	(.../wddx.module.xml)	(revision 76a69094d6b55d08144a793fdab44114d751e766)
+++ lams_build/lib/wddx/wddx.module.xml	(.../wddx.module.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -25,5 +25,14 @@
 <module xmlns="urn:jboss:module:1.3" name="com.allaire.wddx">
   <resources>
     <resource-root path="wddx.jar"/>
-  </resources>
-</module>
+  </resources>  
+  
+  <dependencies>
+ 	<system>
+  		<paths>
+  			<path name="org/xml/sax"/>
+  		</paths>
+  	</system>
+  	<module name="org.apache.xerces" />
+  </dependencies>
+</module>
\ No newline at end of file
Index: lams_build/lib/xml-commons/xmlcommons.module.xml
===================================================================
diff -u -r253b4ddb3a1d592fd36cd9058806ee44b9b15bda -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_build/lib/xml-commons/xmlcommons.module.xml	(.../xmlcommons.module.xml)	(revision 253b4ddb3a1d592fd36cd9058806ee44b9b15bda)
+++ lams_build/lib/xml-commons/xmlcommons.module.xml	(.../xmlcommons.module.xml)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -30,6 +30,7 @@
 				<path name="javax" />
 				<path name="org/xml" />
 				<path name="org/w3c/dom" />
+				<path name="org/w3c/dom/stylesheets" />
   			</exclude-set>
   		</filter>
   	</resource-root>
@@ -41,6 +42,7 @@
 			<path name="javax/xml/parsers" />
 			<path name="org/xml/sax" />
 			<path name="org/w3c/dom" />
+			<path name="org/w3c/dom/stylesheets" />
 		</paths>
 	</system>
   </dependencies>
Index: lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java
===================================================================
diff -u -r668a627903b72826f7dffa148a7e775139af8b5e -r67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1
--- lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java	(.../SVGGenerator.java)	(revision 668a627903b72826f7dffa148a7e775139af8b5e)
+++ lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java	(.../SVGGenerator.java)	(revision 67c47e0f0fd8701ebd288c74e4dd0aa03291f3c1)
@@ -108,7 +108,7 @@
 	    SVGGenerator.serializer = SVGGenerator.lsDOMImplementation.createLSSerializer();
 	    SVGGenerator.serializer.getDomConfig().setParameter("format-pretty-print", Boolean.TRUE);
 	} catch (Exception e) {
-	    SVGGenerator.log.error(e);
+	    SVGGenerator.log.error("Initialization error", e);
 	}
     }