Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -recf9bae729d7f4ff64fb869ea4b25e003d7f68d5 -r5fa7969704b59c54a44ada555d2c43578c7eb42d
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision ecf9bae729d7f4ff64fb869ea4b25e003d7f68d5)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
@@ -20,7 +20,6 @@
         <archive javadoc="http://static.springframework.org/spring/docs/2.5.6/api/" path="/lams_build/lib/spring/spring.jar" source="/3rdParty_sources/spring"/>
         <archive path="/lams_build/lib/struts/struts-el.jar"/>
         <archive javadoc="http://struts.apache.org/1.x/apidocs/" path="/lams_build/lib/struts/struts.jar" source="/3rdParty_sources/struts"/>
-        <archive path="/lams_build/lib/struts/antlr.jar"/>
         <archive javadoc="http://academy.bhtafe.edu.au/hwiebell/Wddx_SDK/7__References/Java/JavaDoc/" path="/lams_build/lib/wddx/wddx.jar"/>
         <archive path="/lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar"/>
         <archive path="/lams_build/lib/xml-commons/xml-apis.jar"/>
Index: lams_build/build.xml
===================================================================
diff -u -r711f2c2440f3bf8a078b15e1afe001a0d379e828 -r5fa7969704b59c54a44ada555d2c43578c7eb42d
--- lams_build/build.xml	(.../build.xml)	(revision 711f2c2440f3bf8a078b15e1afe001a0d379e828)
+++ lams_build/build.xml	(.../build.xml)	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
@@ -670,7 +670,33 @@
 		
 		
 		
+		<copy todir="${jboss.home}/modules/system/layers/base/org/apache/oro/main" overwrite="true" verbose="true">
+			<fileset dir="lib/struts">
+				<include name="jakarta-oro.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${jboss.home}/modules/system/layers/base/org/apache/oro/main/module.xml"
+			  file="lib/struts/jakarta-oro.module.xml" overwrite="true" verbose="true" />
 		
+		<copy todir="${jboss.home}/modules/system/layers/base/org/apache/struts/main" overwrite="true" verbose="true">
+			<fileset dir="lib/struts">
+				<include name="struts.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${jboss.home}/modules/system/layers/base/org/apache/struts/main/module.xml"
+			  file="lib/struts/struts.module.xml" overwrite="true" verbose="true" />
+		
+		<copy todir="${jboss.home}/modules/system/layers/base/org/apache/strutsel/main" overwrite="true" verbose="true">
+			<fileset dir="lib/struts">
+				<include name="struts-el.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${jboss.home}/modules/system/layers/base/org/apache/strutsel/main/module.xml"
+			  file="lib/struts/struts-el.module.xml" overwrite="true" verbose="true" />
+		
+		
+		
+		
 		<echo>${ant.project.name}: Deploying configuration files</echo>
 		<copy todir="${jboss.home}/standalone/configuration" overwrite="true" verbose="true">
 			<fileset dir="${conf.dir}">
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -r711f2c2440f3bf8a078b15e1afe001a0d379e828 -r5fa7969704b59c54a44ada555d2c43578c7eb42d
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 711f2c2440f3bf8a078b15e1afe001a0d379e828)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
@@ -44,6 +44,8 @@
       <module name="org.quartz" />
       <module name="uk.ac.reload" />
       <module name="org.springframework" />
+      <module name="org.apache.struts" /> <!-- depends on: antlr, apache oro -->
+      <module name="org.apache.strutsel" /> <!-- depends on: struts -->
       
       <!-- Import META-INF/services for ServiceLoader impls as well
       <module name="myservicemodule" services="import"/>
Index: lams_build/lib/struts/antlr.jar
===================================================================
diff -u -r8946ab79d8b66ed3a0c83bd30f0620e0c83f02af -r5fa7969704b59c54a44ada555d2c43578c7eb42d
Binary files differ
Index: lams_build/lib/struts/jakarta-oro.module.xml
===================================================================
diff -u
--- lams_build/lib/struts/jakarta-oro.module.xml	(revision 0)
+++ lams_build/lib/struts/jakarta-oro.module.xml	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
@@ -0,0 +1,29 @@
+<?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="org.apache.oro">
+  <resources>
+    <resource-root path="jakarta-oro.jar"/>
+  </resources>
+</module>
Index: lams_build/lib/struts/struts-el.module.xml
===================================================================
diff -u
--- lams_build/lib/struts/struts-el.module.xml	(revision 0)
+++ lams_build/lib/struts/struts-el.module.xml	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
@@ -0,0 +1,33 @@
+<?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="org.apache.strutsel">
+  <resources>
+    <resource-root path="struts-el.jar"/>
+  </resources>
+  
+  <dependencies>
+    <module name="org.apache.struts"/>
+  </dependencies>
+</module>
Index: lams_build/lib/struts/struts.module.xml
===================================================================
diff -u
--- lams_build/lib/struts/struts.module.xml	(revision 0)
+++ lams_build/lib/struts/struts.module.xml	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
@@ -0,0 +1,34 @@
+<?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="org.apache.struts">
+  <resources>
+    <resource-root path="struts.jar"/>
+  </resources>
+  
+  <dependencies>
+    <module name="org.antlr"/>
+    <module name="org.apache.oro"/>
+  </dependencies>
+</module>
Index: lams_build/liblist.txt
===================================================================
diff -u -rf7c31b92ba4f6980d3b70687e8bf43b47dde1ecf -r5fa7969704b59c54a44ada555d2c43578c7eb42d
--- lams_build/liblist.txt	(.../liblist.txt)	(revision f7c31b92ba4f6980d3b70687e8bf43b47dde1ecf)
+++ lams_build/liblist.txt	(.../liblist.txt)	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
@@ -58,8 +58,9 @@
 				  jboss-spring-int-vfs.jar				1.0.0				   					             Red Hat						  integration package, for beanRefContext.xml
 				  jboss-spring-int-deployers.jar		1.0.0				   								 Red Hat
 				  
-struts            antlr.jar													   BSD							 								  ANother Tool for Language Recognition                                                                                                                                                                                                                               
-                  struts.jar                            1.2.7                  Apache License 2.0            Apache						      Struts Framework
+struts            jakarta-oro.jar                       2.0.7                  Apache License 2.0            Apache						      regular expressions
+				  struts.jar                            1.2.7                  Apache License 2.0            Apache						      Struts Framework
+				  struts-el.jar                         1.2.9                  Apache License 2.0            Apache						      Struts extensions
 
 urlrewritefilter urlrewrite-3.2.0.jar                   3.2.0                  BSD License              	 tuckey.org         			  Java Web Filter which allows rewriting URLs