Author: dkulp
Date: Wed Jan 12 22:03:03 2011
New Revision: 1058334
URL: http://svn.apache.org/viewvc?rev=1058334&view=rev
Log:
Merged revisions 1058329 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1058329 | dkulp | 2011-01-12 16:46:22 -0500 (Wed, 12 Jan 2011) | 2 lines
[CXF-622] Change Cache-Control to a string as it can be pretty free
form.
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Propchange: cxf/branches/2.3.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1058334&r1=1058333&r2=1058334&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Wed Jan 12 22:03:03 2011
@@ -452,7 +452,7 @@ public abstract class AbstractHTTPDestin
HTTPServerPolicy policy = server;
if (policy.isSetCacheControl()) {
headers.put("Cache-Control",
- createMutableList(policy.getCacheControl().value()));
+ createMutableList(policy.getCacheControl()));
}
if (policy.isSetContentLocation()) {
headers.put("Content-Location",
Modified:
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1058334&r1=1058333&r2=1058334&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Wed Jan 12 22:03:03 2011
@@ -1247,7 +1247,7 @@ public class HTTPConduit
}
if (policy.isSetCacheControl()) {
headers.put("Cache-Control",
- createMutableList(policy.getCacheControl().value()));
+ createMutableList(policy.getCacheControl()));
}
if (policy.isSetHost()) {
headers.put("Host",
Modified:
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java?rev=1058334&r1=1058333&r2=1058334&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
Wed Jan 12 22:03:03 2011
@@ -301,7 +301,7 @@ public final class PolicyUtils {
if (compatible) {
compatible &= !p1.isSetCacheControl() || !p2.isSetCacheControl()
- ||
p1.getCacheControl().value().equals(p2.getCacheControl().value());
+ || p1.getCacheControl().equals(p2.getCacheControl());
}
if (compatible) {
@@ -454,7 +454,7 @@ public final class PolicyUtils {
result &= (p1.getCacheControl() == null
? p2.getCacheControl() == null
- :
p1.getCacheControl().value().equals(p2.getCacheControl().value())
+ : p1.getCacheControl().equals(p2.getCacheControl())
&&
p1.getConnection().value().equals(p2.getConnection().value()))
&& (p1.getConnectionTimeout() == p2.getConnectionTimeout())
&& equals(p1.getContentType(), p2.getContentType())
@@ -492,7 +492,7 @@ public final class PolicyUtils {
if (compatible) {
compatible &= !p1.isSetCacheControl() || !p2.isSetCacheControl()
- ||
p1.getCacheControl().value().equals(p2.getCacheControl().value());
+ || p1.getCacheControl().equals(p2.getCacheControl());
}
if (compatible) {
@@ -605,7 +605,7 @@ public final class PolicyUtils {
result &= (p1.isHonorKeepAlive() == p2.isHonorKeepAlive())
&& (p1.getCacheControl() == null
? p2.getCacheControl() == null
- :
p1.getCacheControl().value().equals(p2.getCacheControl().value()))
+ : p1.getCacheControl().equals(p2.getCacheControl()))
&& equals(p1.getContentEncoding(), p2.getContentEncoding())
&& equals(p1.getContentLocation(), p2.getContentLocation())
&& equals(p1.getContentType(), p2.getContentType())
Modified:
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=1058334&r1=1058333&r2=1058334&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Wed Jan 12 22:03:03 2011
@@ -114,7 +114,7 @@
</xs:annotation>
</xs:attribute>
- <xs:attribute name="CacheControl"
type="http-conf:serverCacheControlType" use="optional">
+ <xs:attribute name="CacheControl" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
Most commonly used to specify no-cache, however the
standard supports a
@@ -281,7 +281,7 @@
</xs:attribute>
- <xs:attribute name="CacheControl"
type="http-conf:clientCacheControlType" use="optional">
+ <xs:attribute name="CacheControl" type="xs:string"
use="optional">
<xs:annotation>
<xs:documentation>
Most commonly used to specify no-cache, however the
standard supports a
@@ -371,33 +371,6 @@
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="serverCacheControlType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="no-cache"/>
- <xs:enumeration value="public"/>
- <xs:enumeration value="private"/>
- <xs:enumeration value="no-store"/>
- <xs:enumeration value="no-transform"/>
- <xs:enumeration value="must-revalidate"/>
- <xs:enumeration value="proxy-revalidate"/>
- <xs:enumeration value="max-age"/>
- <xs:enumeration value="s-max-age"/>
- <xs:enumeration value="cache-extension"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="clientCacheControlType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="no-cache"/>
- <xs:enumeration value="no-store"/>
- <xs:enumeration value="max-age"/>
- <xs:enumeration value="max-stale"/>
- <xs:enumeration value="min-fresh"/>
- <xs:enumeration value="no-transform"/>
- <xs:enumeration value="only-if-cached"/>
- <xs:enumeration value="cache-extension"/>
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="connectionType">
<xs:restriction base="xs:string">
