svn commit: r688265 - in /ofbiz/trunk/framework/webapp: dtd/site-conf.xsd src/org/ofbiz/webapp/control/ConfigXMLReader.java

[lektran]

Author: lektran
Date: Fri Aug 22 23:17:06 2008
New Revision: 688265

URL: http://svn.apache.org/viewvc?rev=688265&view=rev
Log:
Reverted the rest of Si's recent work since it doesn't look like he is going to complete/correct the RequestHandler part any time soon

Modified:
    ofbiz/trunk/framework/webapp/dtd/site-conf.xsd
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java

Modified: ofbiz/trunk/framework/webapp/dtd/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/dtd/site-conf.xsd?rev=688265&r1=688264&r2=688265&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/dtd/site-conf.xsd (original)
+++ ofbiz/trunk/framework/webapp/dtd/site-conf.xsd Fri Aug 22 23:17:06 2008
@@ -235,15 +235,11 @@
                     <xs:enumeration value="request"/>
                     <xs:enumeration value="request-redirect"/>
                     <xs:enumeration value="request-redirect-noparam"/>
-                    <xs:enumeration value="request-redirect-filterparam"/>
                     <xs:enumeration value="url"/>
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute type="xs:string" name="value"/>
-        <!-- the following two attributes should only be used for request-redirect-filterparam -->
-        <xs:attribute type="xs:string" name="allowed-params"/>
-        <xs:attribute type="xs:string" name="allowed-attributes"/>
     </xs:attributeGroup>
     <xs:element name="view-map">
         <xs:complexType>

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=688265&r1=688264&r2=688265&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Fri Aug 22 23:17:06 2008
@@ -22,12 +22,10 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
 
 import javolution.util.FastList;
 import javolution.util.FastMap;
@@ -212,8 +210,6 @@
     public static final String RESPONSE_TYPE = "type";
     public static final String RESPONSE_VALUE = "value";
     public static final String RESPONSE_MAP = "response-map";
-    public static final String RESPONSE_ALLOWEDPARAMS = "allowed-params";
-    public static final String RESPONSE_ALLOWEDATTRIBUTES = "allowed-attributes";
 
     /** View Config Variables */
     public static final String VIEW_MAPPING = "view-map";
@@ -335,7 +331,7 @@
             uriMap.put(REQUEST_DESCRIPTION, UtilValidate.isNotEmpty(description) ? description : "");
 
             // Get the response(s).
-            Map<String, Object> responseMap = FastMap.newInstance();
+            Map<String, String> responseMap = FastMap.newInstance();
             uriMap.put(RESPONSE_MAP, responseMap);
             
             for (Element responseElement: UtilXml.childElementList(requestMapElement, RESPONSE)) {
@@ -343,20 +339,6 @@
                 String type = responseElement.getAttribute(RESPONSE_TYPE);
                 String value = responseElement.getAttribute(RESPONSE_VALUE);
                 
-                String allowedParams = responseElement.getAttribute(RESPONSE_ALLOWEDPARAMS);
-                if (allowedParams != null && allowedParams.length() > 0) {
-                    String[] allowedParamsList = allowedParams.split(",");
-                    Set allowedParamsSet = new HashSet();
-                    allowedParamsSet.addAll(Arrays.asList(allowedParamsList));
-                    responseMap.put(RESPONSE_ALLOWEDPARAMS, allowedParamsSet);
-                }
-                String allowedAttributes = responseElement.getAttribute(RESPONSE_ALLOWEDATTRIBUTES);
-                if (allowedAttributes != null && allowedAttributes.length() > 0) {
-                    String[] allowedAttributesList = allowedAttributes.split(",");
-                    Set allowedAttributesSet = new HashSet();
-                    allowedAttributesSet.addAll(Arrays.asList(allowedAttributesList));
-                    responseMap.put(RESPONSE_ALLOWEDATTRIBUTES, allowedAttributesSet);
-                }
                 responseMap.put(name, type + ":" + value);
             }