Updated web.xml with Spring goodies

Initial spring bean config files
Remove old WEB-INF files

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2076 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/WEB-INF/attributeContext.xml b/WEB-INF/attributeContext.xml
new file mode 100644 (file)
index 0000000..d5091d3
--- /dev/null
+++ b/WEB-INF/attributeContext.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+    <bean id="AttributeFilterEngine" class="" scope="singleton">
+        <property name="SiteARP" value="/IDP_HOME/site.arp.xml" />
+    </bean>
+    
+    <bean id="AttributeResolver" class="" scope="singleton">
+        <property name="filterEngine" ref="AttributeFilterEgine" />
+        <property name="resolverConfig" value="/IDP_HOME/resolve.xml" />
+    </bean>
+</beans>
\ No newline at end of file

diff --git a/webAppConfig/dist.idp-client-cert.xml b/WEB-INF/dist.idp-client-cert.xml
similarity index 100%
rename from webAppConfig/dist.idp-client-cert.xml
rename to WEB-INF/dist.idp-client-cert.xml

diff --git a/webAppConfig/dist.idp-container-security-example.xml b/WEB-INF/dist.idp-container-security-example.xml
similarity index 100%
rename from webAppConfig/dist.idp-container-security-example.xml
rename to WEB-INF/dist.idp-container-security-example.xml

diff --git a/webAppConfig/dist.idp.xml b/WEB-INF/dist.idp.xml
similarity index 100%
rename from webAppConfig/dist.idp.xml
rename to WEB-INF/dist.idp.xml

diff --git a/WEB-INF/idpContext.xml b/WEB-INF/idpContext.xml
new file mode 100644 (file)
index 0000000..f85f686
--- /dev/null
+++ b/WEB-INF/idpContext.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+    
+</beans>
\ No newline at end of file

diff --git a/WEB-INF/profileContext.xml b/WEB-INF/profileContext.xml
new file mode 100644 (file)
index 0000000..f85f686
--- /dev/null
+++ b/WEB-INF/profileContext.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+    
+</beans>
\ No newline at end of file

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
new file mode 100644 (file)
index 0000000..6e0c33e
--- /dev/null
+++ b/WEB-INF/web.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
+         version="2.4">
+    
+    <!--
+      Spring 2.0 application context files.  Files are loaded in the order they appear with subsequent files 
+      overwritting same named beans in previous files.
+    -->
+    <context-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>/WEB-INF/idpContext.xml, /WEB-INF/resolverContext.xml, /WEB-INF/profile.xml</param-value>
+    </context-param>
+    
+    <!-- 
+      Spring 2.0 listener used to load up the configuration
+    -->
+    <listener>
+      <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+    
+    <!-- 
+      Session time inactivity timeout, in minutes.
+      
+      A timeout of 0 or less means the session never timesout.  Such a setting is strongly discouraged and will 
+      almost certainly lead to memory exhaustion under moderate to heavy loads or in servers with prolonged uptime.
+     -->
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+
+    <!--
+      Profile Request Dispatcher
+    -->
+    <servlet>
+        <servlet-name>ProfileRequestDispatcher</servlet-name>
+        <servlet-class>edu.internet2.middleware.shibboleth.idp.profile.ProfileRequestDispatcher</servlet-class>
+    </servlet>
+        
+    <servlet-mapping>
+        <servlet-name>ProfileRequestDispatcher</servlet-name>
+        <url-pattern>/IdP</url-pattern>
+    </servlet-mapping>
+    
+    <!--
+      Authentication Manager
+    -->
+    <servlet>
+        <servlet-name>AuthenticationManager</servlet-name>
+        <servlet-class>edu.internet2.middleware.shibboleth.idp.authn.AuthenticationManager</servlet-class>
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>AuthenticationManager</servlet-name>
+        <url-pattern>/IdP/Authn</url-pattern>
+    </servlet-mapping>
+    
+</web-app>
\ No newline at end of file

diff --git a/webApplication/WEB-INF/tlds/struts-bean.tld b/webApplication/WEB-INF/tlds/struts-bean.tld
deleted file mode 100755 (executable)
index d8e4425..0000000
--- a/webApplication/WEB-INF/tlds/struts-bean.tld
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-\r
-\r
-\r
-\r
-\r
-\r
-\r
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">\r
-<taglib>\r
-<tlibversion>1.0</tlibversion>\r
-<jspversion>1.1</jspversion>\r
-<shortname>bean</shortname>\r
-<uri>http://jakarta.apache.org/struts/tags-bean-1.0.2</uri>\r
-<tag>\r
-<name>cookie</name>\r
-<tagclass>org.apache.struts.taglib.bean.CookieTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.CookieTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>multiple</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>define</name>\r
-<tagclass>org.apache.struts.taglib.bean.DefineTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.DefineTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>toScope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>type</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>header</name>\r
-<tagclass>org.apache.struts.taglib.bean.HeaderTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.HeaderTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>multiple</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>include</name>\r
-<tagclass>org.apache.struts.taglib.bean.IncludeTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.IncludeTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>anchor</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>forward</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>href</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>page</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>transaction</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>message</name>\r
-<tagclass>org.apache.struts.taglib.bean.MessageTag</tagclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>arg0</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>arg1</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>arg2</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>arg3</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>arg4</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>bundle</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>key</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>locale</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>page</name>\r
-<tagclass>org.apache.struts.taglib.bean.PageTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.PageTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>parameter</name>\r
-<tagclass>org.apache.struts.taglib.bean.ParameterTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.ParameterTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>multiple</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>resource</name>\r
-<tagclass>org.apache.struts.taglib.bean.ResourceTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.ResourceTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>input</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>size</name>\r
-<tagclass>org.apache.struts.taglib.bean.SizeTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.SizeTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>collection</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>struts</name>\r
-<tagclass>org.apache.struts.taglib.bean.StrutsTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.bean.StrutsTei</teiclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>formBean</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>forward</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>mapping</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>write</name>\r
-<tagclass>org.apache.struts.taglib.bean.WriteTag</tagclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>filter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>ignore</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-</taglib>\r
-\r
-\r
-\r

diff --git a/webApplication/WEB-INF/tlds/struts-logic.tld b/webApplication/WEB-INF/tlds/struts-logic.tld
deleted file mode 100755 (executable)
index bf03f24..0000000
--- a/webApplication/WEB-INF/tlds/struts-logic.tld
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-\r
-\r
-\r
-\r
-\r
-\r
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">\r
-<taglib>\r
-<tlibversion>1.0</tlibversion>\r
-<jspversion>1.1</jspversion>\r
-<shortname>logic</shortname>\r
-<uri>http://jakarta.apache.org/struts/tags-logic-1.0</uri>\r
-<tag>\r
-<name>equal</name>\r
-<tagclass>org.apache.struts.taglib.logic.EqualTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>forward</name>\r
-<tagclass>org.apache.struts.taglib.logic.ForwardTag</tagclass>\r
-<bodycontent>empty</bodycontent>\r
-<attribute>\r
-<name>name</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>greaterEqual</name>\r
-<tagclass>org.apache.struts.taglib.logic.GreaterEqualTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>greaterThan</name>\r
-<tagclass>org.apache.struts.taglib.logic.GreaterThanTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>iterate</name>\r
-<tagclass>org.apache.struts.taglib.logic.IterateTag</tagclass>\r
-<teiclass>org.apache.struts.taglib.logic.IterateTei</teiclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>collection</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>id</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>indexId</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>length</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>offset</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>type</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>lessEqual</name>\r
-<tagclass>org.apache.struts.taglib.logic.LessEqualTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>lessThan</name>\r
-<tagclass>org.apache.struts.taglib.logic.LessThanTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>match</name>\r
-<tagclass>org.apache.struts.taglib.logic.MatchTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>location</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>notEqual</name>\r
-<tagclass>org.apache.struts.taglib.logic.NotEqualTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>notMatch</name>\r
-<tagclass>org.apache.struts.taglib.logic.NotMatchTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>location</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>value</name>\r
-<required>true</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>notPresent</name>\r
-<tagclass>org.apache.struts.taglib.logic.NotPresentTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>role</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>user</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>present</name>\r
-<tagclass>org.apache.struts.taglib.logic.PresentTag</tagclass>\r
-<bodycontent>JSP</bodycontent>\r
-<attribute>\r
-<name>cookie</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>header</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>parameter</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>role</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>user</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-<tag>\r
-<name>redirect</name>\r
-<tagclass>org.apache.struts.taglib.logic.RedirectTag</tagclass>\r
-<attribute>\r
-<name>anchor</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>forward</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>href</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>name</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>page</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>paramId</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>paramName</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>paramProperty</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>paramScope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>property</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>scope</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-<attribute>\r
-<name>transaction</name>\r
-<required>false</required>\r
-<rtexprvalue>true</rtexprvalue>\r
-</attribute>\r
-</tag>\r
-</taglib>\r
-\r
-\r
-\r