svn commit: r753467 - in /ode/trunk: axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpHelperTest.java utils/src/main/java/org/apache/ode/utils/http/HttpUtils.java

[midon]

Author: midon
Date: Fri Mar 13 23:07:39 2009
New Revision: 753467

URL: http://svn.apache.org/viewvc?rev=753467&view=rev
Log:
ODE-540: support parameters

Modified:
    
ode/trunk/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpHelperTest.java
    ode/trunk/utils/src/main/java/org/apache/ode/utils/http/HttpUtils.java

Modified: 
ode/trunk/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpHelperTest.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpHelperTest.java?rev=753467&r1=753466&r2=753467&view=diff
==============================================================================
--- 
ode/trunk/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpHelperTest.java
 (original)
+++ 
ode/trunk/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpHelperTest.java
 Fri Mar 13 23:07:39 2009
@@ -28,22 +28,23 @@
  */
 public class HttpHelperTest extends TestCase {
     private static final String[] IS_XML = new String[]{
-            "application/atom+xml"
-            , "text/xml"
+            "application/atom+xml; param1=value1; param2=value2"
+            , "text/xml; charset=ISO-8859-4"
             , "application/xml"
-            , "application/xhtml+xml"
+            , "application/xhtml+xml; charset=ISO-8859-4; parameter=value"
             , "image/foo+xml"
     };
     private static final String[] IS_TEXT = new String[]{
             "text/xml-external-parsed-entity"
-            , "text/plain"
-            , "text/css"
+            , "text/xml-external-parsed-entity; charset=ISO-8859-4"
+            , "text/plain; charset=ISO-8859-4"
+            , "text/css; param1=value1; param2=value2"
             , "text/csv"
     };
     private static final String[] IS_IMAGE = new String[]{
             "image/jpeg"
             , "image/png"
-            , "image/gif"
+            , "image/gif; param1=value1; param2=value2"
     };
 
 

Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/http/HttpUtils.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/http/HttpUtils.java?rev=753467&r1=753466&r2=753467&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/http/HttpUtils.java 
(original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/http/HttpUtils.java Fri 
Mar 13 23:07:39 2009
@@ -26,8 +26,8 @@
  *
  */
 public class HttpUtils {
-    public static final String XML_MIME_TYPE_REGEX = 
"(text/xml)|(application/xml)|((.*)\\+xml)";
-    public static final String TEXT_MIME_TYPE_REGEX = "text/(?!xml$).*";
+    public static final String XML_MIME_TYPE_REGEX = 
"((text/xml)|(application/xml)|((.*)\\+xml))(;.*)*";
+    public static final String TEXT_MIME_TYPE_REGEX = 
"text/(?!xml(;(.*)*))(.*)";
     public static final Pattern XML_MIME_TYPE_PATTERN = 
Pattern.compile(XML_MIME_TYPE_REGEX);
     public static final Pattern TEXT_MIME_TYPE_PATTERN = 
Pattern.compile(TEXT_MIME_TYPE_REGEX);